diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2016-04-20 09:33:21 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2016-04-22 07:37:31 +0000 |
| commit | cc04b84917ef0f90e2017bf652b7327ce5edda9c (patch) | |
| tree | fe374cd50bb8e9f18c4b747f97a0712e41124d16 /src/libs/3rdparty | |
| parent | 89c2b2cd327a1f929924265622c80e22719998d4 (diff) | |
Fix compiler warnings on windows.
Ignore some warnings inside 3rd party code and fix a lot of conversion
warnings.
Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
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 b3a26e4e84..1da11b4751 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri @@ -36,7 +36,7 @@ win32 { win32-msvc* { QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs - QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 + QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 -wd4297 -wd4267 -wd4334 DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS } else { QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long |