summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-03-22 07:47:14 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-04-07 01:51:44 +0000
commit97d7d80e7355019bb23bb03c2a82908e4436deb0 (patch)
treeaf46ab44105515c4adcc99fec957847533eba076 /mkspecs
parentf672bd6316489bef80a3f9e4c70dc01e75d92256 (diff)
downloadqtbase-97d7d80e7355019bb23bb03c2a82908e4436deb0.tar.gz
Disable MSVC warning 4577 in headersclean
This warning is added in MSVC 2015 and is printed when we use noexcept in modules we turned exceptions off. Task-number: QTBUG-59645 Change-Id: Id92f4a61915b49ddaee6fffd14ae3b943ccd2bce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_module_headers.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 9248be2d68..4a4a41850d 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -252,6 +252,11 @@ headersclean:!internal_module {
# -Za enables strict standards behavior, but we can't add it because
# <windows.h> and <GL.h> violate the standards.
hcleanFLAGS = -WX -W3 -wd4180 -wd4458
+
+ # MSVC 2015 (compiler version 19.0):
+ # 4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc
+ greaterThan(QMAKE_MSC_VER, 18): hcleanFLAGS += -wd4577
+
hcleanCOMMAND = $$QMAKE_CXX -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -FI${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} \
$$[QT_INSTALL_DATA/src]/mkspecs/features/data/dummy.cpp
}