From a12a2fdf684a6fc19aefc14f32842deab0270e86 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 22 May 2014 14:31:25 +0200 Subject: [PATCH] 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 include in qglobal.h. Newer versions of MSVC do not have this problem. Task-number: QTBUG-39126 Change-Id: Ieea5adde649fe16e6b41fbbb23fd582b3bb12b89 Reviewed-by: Friedemann Kleint --- mkspecs/win32-msvc2010/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 =