feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Botan: Fix build with MSVC from Visual Studio 2017 15.8

Browse Source 
Task-number: QTCREATORBUG-20955
Change-Id: I7413e73137248bb880fad9b369e05e09101987fd
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2018-08-16 16:40:22 +02:00
parent 21bcc7f38b
commit 3ff33198bc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/botan/botan.pro
View File

@@ -28,7 +28,8 @@ mingw {
OTHER_FLAGS += --without-stack-protector OTHER_FLAGS += --without-stack-protector
} }
BOTAN_CXX_FLAGS = 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 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) macos: BOTAN_CXX_FLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET -isysroot $$shell_quote($$QMAKE_MAC_SDK_PATH)
unix: BOTAN_CXX_FLAGS += -fPIC unix: BOTAN_CXX_FLAGS += -fPIC

2
src/libs/botan/botan.qbs
View File

@@ -44,7 +44,7 @@ Product {
var cxxFlags = []; var cxxFlags = [];
if (product.qbs.toolchain.contains("msvc")) { if (product.qbs.toolchain.contains("msvc")) {
cxxFlags.push("/wd4127", "/wd4244", "/wd4250", "/wd4267", "/wd4334", "/wd4702", cxxFlags.push("/wd4127", "/wd4244", "/wd4250", "/wd4267", "/wd4334", "/wd4702",
"/wd4996"); "/wd4996", "/D_ENABLE_EXTENDED_ALIGNED_STORAGE");
} }
else if (product.qbs.toolchain.contains("gcc")) else if (product.qbs.toolchain.contains("gcc"))
cxxFlags.push("-Wno-unused-parameter"); cxxFlags.push("-Wno-unused-parameter");