diff options
| author | Debao Zhang <hello@debao.me> | 2015-03-26 11:48:58 +0800 |
|---|---|---|
| committer | Debao Zhang <hello@debao.me> | 2015-03-28 02:34:06 +0000 |
| commit | f624220b100f338720f00c1e695ab9a277c4b34d (patch) | |
| tree | eea2866580142aac5218956856d9e9cd74da3f0e /mkspecs/common | |
| parent | 17e750d53aff5e98107753d1c66e21b1016ec877 (diff) | |
fix C4275 warnings for MSVC 2010 build
This issue had been fixed by SHA: a12a2fdf684a6fc19aefc14f32842deab0270e86
but re-introduced by SHA: c23d1c76953704ecb52c833d7ef1de2e2f89b1e6 again.
Task-number: QTBUG-45085
Change-Id: If98ee108335d80035179a83b1b28f384395d8373
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index e16938b7b8..e638af6b6a 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STL_OFF = QMAKE_CXXFLAGS_RTTI_ON = -GR QMAKE_CXXFLAGS_RTTI_OFF = QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc -QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -D_HAS_EXCEPTIONS=0 +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = @@ -115,6 +115,7 @@ greaterThan(MSC_VER, 1599) { greaterThan(MSC_VER, 1699) { # Visual Studio 2012 (11.0) / Visual C++ 17.0 and up + QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -D_HAS_EXCEPTIONS=0 QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE@QMAKE_SUBSYSTEM_SUFFIX@ QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS@QMAKE_SUBSYSTEM_SUFFIX@ QT_CONFIG += c++11 |