diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-14 08:59:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-14 08:59:46 +0100 |
| commit | 259c8245ef6d9c2d6f0e1abd0983338d87ddb09a (patch) | |
| tree | bc672eb387fca9c9dcbcb13dd78aa15bc279481b /sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | |
| parent | 1704567d7ad0d21dd3b588af7aad40cd244c1799 (diff) | |
| parent | da5f43b6cbecac437f80fbb1b1405292b3962d3b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia02c84b0afac228a713759719474be126161f9ae
Diffstat (limited to 'sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp index f301733fe..d3e5e212f 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp @@ -309,6 +309,8 @@ QByteArrayList emulatedCompilerOptions() HeaderPaths headerPaths; result.append(QByteArrayLiteral("-fms-compatibility-version=19")); 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")); #elif defined(Q_CC_CLANG) HeaderPaths headerPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("clang++"))); result.append(noStandardIncludeOption()); |