diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-03 08:34:15 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-03 08:49:05 +0000 |
| commit | 9f0a954cf5a661da3ad6dde3b0ab3ecf32119e29 (patch) | |
| tree | 5b6734fbfb9ef2d18878ba7bd8f0d22778aea592 /sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | |
| parent | 347a32255a2e8e3c6d73b94b1cfe74fddbe09aad (diff) | |
Remove most QT_VERSION checks
As a drive by, adapt to changed values of QMetaObject::Call.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ic55a5da910c9ef022af3dedf749f80153f519ebf
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp index 071eb3bde..659324f8c 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp @@ -357,16 +357,7 @@ QByteArrayList emulatedCompilerOptions() LanguageLevel emulatedCompilerLanguageLevel() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return LanguageLevel::Cpp17; -#else -# if defined(Q_CC_MSVC) && _MSC_VER > 1900 - // Fixes constexpr errors in MSVC2017 library headers with Clang 4.1..5.X (0.45 == Clang 6). - if (libClangVersion() < QVersionNumber(0, 45)) - return LanguageLevel::Cpp1Z; -# endif // Q_CC_MSVC && _MSC_VER > 1900 - return LanguageLevel::Cpp14; // otherwise, t.h is parsed as "C" -#endif // Qt 5 } struct LanguageLevelMapping |