aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-14 13:23:04 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-14 13:20:25 +0000
commit8757b8a9079d93bad4e1d9235b20aba1c2e33356 (patch)
treec2d110e968f7417c954c728eafa94357d09828c5 /sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
parentb8bb6e623939f5f3bf2ed61a04511190e307bba0 (diff)
shiboken2: Adapt compiler options for MSVC
Raise compatibility to the latest MSVC 2019 (fixing a parser error related to constexpr QStringView) and add -fdelayed-template-parsing for speed. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ia1216d36ef65ee752af89a365c8b1d7c008ed801 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp')
-rw-r--r--sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index dac511003..071eb3bde 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -307,7 +307,8 @@ QByteArrayList emulatedCompilerOptions()
QByteArrayList result;
#if defined(Q_CC_MSVC)
HeaderPaths headerPaths;
- result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
+ result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806"));
+ result.append(QByteArrayLiteral("-fdelayed-template-parsing"));
result.append(QByteArrayLiteral("-Wno-microsoft-enum-value"));
// Fix yvals_core.h: STL1000: Unexpected compiler version, expected Clang 7 or newer (MSVC2017 update)
result.append(QByteArrayLiteral("-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH"));