Merge pull request #2 from dbrnz/Qt5.12

florianlink · web-flow · commit 720a3c242543 · 2020-08-09T14:45:34.000+02:00
Support Qt 5.12
diff --git a/build/common.prf b/build/common.prf
@@ -32,6 +32,9 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp
       else:contains( QT_MINOR_VERSION, 11 ) { 
         PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
       }
+      else:contains( QT_MINOR_VERSION, 12 ) {
+        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
+      }
       else:contains( QT_MINOR_VERSION, 1 ) {
         PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_50
       }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp`
`32`	`32`	`else:contains( QT_MINOR_VERSION, 11 ) {`
`33`	`33`	`PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511`
`34`	`34`	`}`
	`35`	`+ else:contains( QT_MINOR_VERSION, 12 ) {`
	`36`	`+ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511`
	`37`	`+ }`
`35`	`38`	`else:contains( QT_MINOR_VERSION, 1 ) {`
`36`	`39`	`PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_50`
`37`	`40`	`}`