diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-04 12:50:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-06 12:58:01 +0000 |
| commit | a8cff0a4dea4c5041854f9200b110e19af210a0f (patch) | |
| tree | 677534eea3b6b1569c65599261b51e4aebc7a237 | |
| parent | 6eaaedc646bc6d7d4dc97274c776abab9b54008f (diff) | |
Fix QNX build on Windows
Configure on Windows in Qt 5.6 does not detect the target gcc version
correctly and reports the host gcc version instead. That means we'll end
up enabling -fno-lifetime-dse with a gcc version that doesn't support it
and consequently fail to build.
Since in the 5.6 branch we only support QNX 6 and we know that the gcc
version is 4.7 and thus not affected by the DSE problem, we might as
well unconditionally disable the workaround there.
This change is only for 5.6 as 5.8/5.9 and newer detect the gcc version
correctly _and_ don't need the -fno-lifetime-dse workaround anymore.
Task-number: QTBUG-62820
Change-Id: I55baf532a9126eb2f8c5f11858d52cccad6c355b
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -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 } |