aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml.pro
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-07-30 10:57:59 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-07-31 05:55:12 +0200
commite194308ee5d26aadd294ab49abb998a52c2a2ca4 (patch)
treea968e12cc9405b8216088a49efe792fbd288b77d /src/qml/qml.pro
parent8dbc32a48e53a2e654bd27394ec306b86f1aeb0e (diff)
Update the WERROR setting for QtQml
Apple Clang 5.1 added the -Wunused-const-variable option from Clang 3.4. Change-Id: I95abe373d875ead0565d32187720e1b9042af0ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml.pro')
-rw-r--r--src/qml/qml.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 17d35f8c54..6e06fb42ef 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -19,9 +19,11 @@ exists("qqml_enable_gcov") {
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
# 2415: variable "xx" of static storage duration was declared but never referenced
-# unused variable 'xx' [-Werror,-Wunused-const-variable]
intel_icc: WERROR += -ww2415
-clang:if(greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)): \
+# unused variable 'xx' [-Werror,-Wunused-const-variable]
+greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)| \
+ greaterThan(QT_APPLE_CLANG_MAJOR_VERSION, 5)| \
+ if(equals(QT_APPLE_CLANG_MAJOR_VERSION, 5):greaterThan(QT_APPLE_CLANG_MINOR_VERSION, 0)): \
WERROR += -Wno-error=unused-const-variable
load(qt_module)