diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2016-04-26 11:09:44 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2016-04-26 12:32:54 +0000 |
| commit | abeac6219146133f3b025c895d7e9924d5194268 (patch) | |
| tree | 39d7e79c84f7b4b413cf617555723da0ad8fa871 /src/libs/3rdparty/botan | |
| parent | 7b7b1823cbfbf95589bf1f8fc07253f3f5ad7477 (diff) | |
Fix building creator with the intel compiler.
Replacing all occurrences of win32-msvc* with msvc.
Task-number: QTCREATORBUG-16118
Change-Id: I46bd54628bffb04c24bca587fd9dd7684e888f1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/libs/3rdparty/botan')
| -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 b3a26e4e84c..1d2162c31f0 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 DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS |