diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-22 14:31:25 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-23 11:39:25 +0200 |
commit | a12a2fdf684a6fc19aefc14f32842deab0270e86 (patch) | |
tree | 0a7acda04b91e5b282d7133acfb44d78db544030 /mkspecs/win32-msvc2010 | |
parent | 3b7599800e3c0185f5a5632460eb830103945062 (diff) |
fix C4275 warnings for MSVC 2010 build
The _HAS_EXCEPTIONS=0 define that was introduced in commit
f59083636b89fc9b7983f9a0758a79f2980826dc leads to lots of C4275
warnings:
non dll-interface class "stdext::exception" used as base for dll-interface class "std::bad_cast"
from the <algorithm> include in qglobal.h.
Newer versions of MSVC do not have this problem.
Task-number: QTBUG-39126
Change-Id: Ieea5adde649fe16e6b41fbbb23fd582b3bb12b89
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'mkspecs/win32-msvc2010')
-rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index f24da2d5c6..54286d51c2 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -54,7 +54,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 = |