diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-05-03 11:49:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-05-03 11:49:01 +0200 |
| commit | 0f94aa3f4d8c38d0fb247f2e56b4153b03bc43b9 (patch) | |
| tree | 092bf6aab0688c0cae20e0d355cc7d75fd614378 /src/libs/3rdparty | |
| parent | 5fa52d2ff9a93110cff38cf43c16268515fed937 (diff) | |
| parent | 9b69b789ab8a7ccc0f7c251f364f232f2a41c7fd (diff) | |
| download | qt-creator-0f94aa3f4d8c38d0fb247f2e56b4153b03bc43b9.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/projectexplorer/projectwizardpage.cpp
src/plugins/projectexplorer/xcodebuildparser.h
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/tools/clangbackend/ipcsource/translationunits.cpp
Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
Diffstat (limited to 'src/libs/3rdparty')
| -rw-r--r-- | src/libs/3rdparty/botan/botan.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri index 1da11b4751..abf66bfba7 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri @@ -34,7 +34,7 @@ win32 { BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \ BOTAN_HAS_MUTEX_WIN32 - win32-msvc* { + msvc { QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 -wd4297 -wd4267 -wd4334 DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS |