summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-06-16 16:52:08 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-07-15 01:54:06 +0000
commita372cf5a80ec1a774f8f624b30b3c8209b800ec8 (patch)
treeb5cdea9d430fabe41ebfc3390ac4018c8b1ec249 /mkspecs
parent5d935dca0c70618af519c5bef2e11b4a1ee03507 (diff)
Enable -WX (warnings are errors) for MSVC 2015
Change-Id: Ib57b52598e2f452985e9fffd1458b565f9bda0f8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_common.prf6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index b060ff604e..b367bc12af 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -100,9 +100,9 @@ warnings_are_errors:warning_clean {
# Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
}
- } else:msvc {
- # enable for MSVC 2012, MSVC 2013
- equals(MSVC_VER, "11.0")|equals(MSVC_VER, "12.0"): QMAKE_CXXFLAGS_WARN_ON += -WX
+ } else:msvc:!intel_icl {
+ # enable for MSVC 2012, MSVC 2013, MSVC 2015
+ contains(MSVC_VER, "1[124].0"): QMAKE_CXXFLAGS_WARN_ON += -WX
}
unset(ver)
}