added Qt 5.4 support

florianlink · florianlink · commit a8de7f11d48b · 2015-02-03T10:38:04.000Z
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@389 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
diff --git a/src/src.pro b/src/src.pro
@@ -26,6 +26,9 @@ contains(QT_MAJOR_VERSION, 5) {
   QT += widgets
 }
 
+# Qt 5.4 adds this option, but this is not compatible with the Python API
+QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
+ 
 INCLUDEPATH += $$PWD
 
 include ( ../build/common.prf )  

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ contains(QT_MAJOR_VERSION, 5) {`
`26`	`26`	`QT += widgets`
`27`	`27`	`}`
`28`	`28`
	`29`	`+# Qt 5.4 adds this option, but this is not compatible with the Python API`
	`30`	`+QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings`
	`31`	`+`
`29`	`32`	`INCLUDEPATH += $$PWD`
`30`	`33`
`31`	`34`	`include ( ../build/common.prf )`