aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml.pro
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-07-22 22:03:25 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-07-23 05:18:49 +0000
commit8a8b826cad197cf39e50f88521d0c40dc9c9344d (patch)
treeb8b9502c17a23af1ebb5796f9abe45a793d3ec27 /src/qml/qml.pro
parentc3a8f7b0eb824f974f752992e6d1dbd1651ab7bf (diff)
ICC: suppress the warning about -fno-delete-null-pointer-checks
Recent qtbase updates set QT_GCC_MAJOR_VERSION even for ICC. Change-Id: I149e0540c00745fe8119fffd1463d34701f370f3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml.pro')
-rw-r--r--src/qml/qml.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index d9452a6257..cc5023f12a 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -22,7 +22,7 @@ exists("qqml_enable_gcov") {
LIBS_PRIVATE += -lgcov
}
-greaterThan(QT_GCC_MAJOR_VERSION, 5) {
+gcc:!intel_icc:greaterThan(QT_GCC_MAJOR_VERSION, 5) {
# Our code is bad. Temporary workaround.
QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
}