diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-16 16:40:22 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-17 13:31:00 +0000 |
| commit | 3ff33198bcf8b426022fd4d50ad0affdbc7edd2a (patch) | |
| tree | 6d0d1c8fcf8649ca2a58fb60cc81628b49225a42 | |
| parent | 21bcc7f38b1a08168f98054358574b21f33b49b6 (diff) | |
| download | qt-creator-3ff33198bcf8b426022fd4d50ad0affdbc7edd2a.tar.gz | |
Botan: Fix build with MSVC from Visual Studio 2017 15.8
Task-number: QTCREATORBUG-20955
Change-Id: I7413e73137248bb880fad9b369e05e09101987fd
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/libs/botan/botan.pro | 3 | ||||
| -rw-r--r-- | src/libs/botan/botan.qbs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/botan/botan.pro b/src/libs/botan/botan.pro index eb03ffee85..2f238e5d03 100644 --- a/src/libs/botan/botan.pro +++ b/src/libs/botan/botan.pro @@ -28,7 +28,8 @@ mingw { OTHER_FLAGS += --without-stack-protector } BOTAN_CXX_FLAGS = -msvc: BOTAN_CXX_FLAGS += /wd4127 /wd4244 /wd4250 /wd4267 /wd4334 /wd4702 /wd4996 +msvc: BOTAN_CXX_FLAGS += /wd4127 /wd4244 /wd4250 /wd4267 /wd4334 /wd4702 /wd4996 \ + /D_ENABLE_EXTENDED_ALIGNED_STORAGE else: BOTAN_CXX_FLAGS += -Wno-unused-parameter macos: BOTAN_CXX_FLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET -isysroot $$shell_quote($$QMAKE_MAC_SDK_PATH) unix: BOTAN_CXX_FLAGS += -fPIC diff --git a/src/libs/botan/botan.qbs b/src/libs/botan/botan.qbs index 3872e900ad..65aa6ebb96 100644 --- a/src/libs/botan/botan.qbs +++ b/src/libs/botan/botan.qbs @@ -44,7 +44,7 @@ Product { var cxxFlags = []; if (product.qbs.toolchain.contains("msvc")) { cxxFlags.push("/wd4127", "/wd4244", "/wd4250", "/wd4267", "/wd4334", "/wd4702", - "/wd4996"); + "/wd4996", "/D_ENABLE_EXTENDED_ALIGNED_STORAGE"); } else if (product.qbs.toolchain.contains("gcc")) cxxFlags.push("-Wno-unused-parameter"); |