diff options
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/qml/qml.pro | 2 | ||||
| -rw-r--r-- | src/quick/quick.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/qqmlecmascript.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index fb9626c40e..774dcf3a70 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -3,7 +3,7 @@ TARGET = particlesplugin TARGETPATH = QtQuick/Particles.2 IMPORT_VERSION = 2.0 -greaterThan(QT_GCC_MAJOR_VERSION, 5) { +greaterThan(QT_GCC_MAJOR_VERSION, 5):!qnx { # Our code is bad. Temporary workaround. Fixed in 5.8 QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse } diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 7c9eef6df1..55485eb16a 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -16,7 +16,7 @@ exists("qqml_enable_gcov") { LIBS_PRIVATE += -lgcov } -greaterThan(QT_GCC_MAJOR_VERSION, 5) { +greaterThan(QT_GCC_MAJOR_VERSION, 5):!qnx { # Our code is bad. Temporary workaround. QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse } diff --git a/src/quick/quick.pro b/src/quick/quick.pro index f56fb2e081..f129a2956a 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -13,7 +13,7 @@ exists("qqml_enable_gcov") { LIBS_PRIVATE += -lgcov } -greaterThan(QT_GCC_MAJOR_VERSION, 5) { +greaterThan(QT_GCC_MAJOR_VERSION, 5):!qnx { # Our code is bad. Temporary workaround. Fixed in 5.8 QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse } diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro index 21e745f58e..6b176236aa 100644 --- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro +++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro @@ -13,7 +13,7 @@ RESOURCES += qqmlecmascript.qrc include (../../shared/util.pri) -greaterThan(QT_GCC_MAJOR_VERSION, 5) { +greaterThan(QT_GCC_MAJOR_VERSION, 5):!qnx { # Our code is bad. Temporary workaround. Fixed in 5.8 QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse } |