diff options
| author | Christian Heimlich <chris@pcserenity.com> | 2022-02-09 16:41:36 -0500 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-12 00:32:03 +0000 |
| commit | d0f62bde91db424b44cd7eab23477aac73622e0a (patch) | |
| tree | 38c3c144e273e83debedefb323ce1d5790fc5269 /mkspecs | |
| parent | 71fd17ada17ad8c24a99927482d96bf5d81f626d (diff) | |
Update MSVC qmake mkspecs to make -std:c++20 available for VS2019 16.11+
Set QMAKE_CXXFLAGS_CXX2A variable to -std:c++20 while building projects
with qmake and MSVC 16.11 or greater (_MSC_FULL_VER >= 192930133), when
c++2a is specified in the project config.
Change-Id: If9a48d1ed16cb05c5cc01414ce8a4344e22438fe
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit cc70c397cefe12436e2228fd70bb1f043ca260a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/msvc-version.conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index 59fc0769a5..13dd349cf4 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -131,6 +131,14 @@ greaterThan(QMAKE_MSC_VER, 1927) { QMAKE_CFLAGS_C17 = /std:c17 } +greaterThan(QMAKE_MSC_VER, 1928) { + # Visual Studio 2019 (16.10 or 16.11) / Visual C++ 19.29 and up + MSVC_VER = 16.10 + + # -std:c++20 compiler option for Visual Studio 2019 16.11.0 and up + greaterThan(QMAKE_MSC_FULL_VER, 192930132): QMAKE_CXXFLAGS_CXX2A = -std:c++20 +} + greaterThan(QMAKE_MSC_VER, 1929) { # Visual Studio 2022 (17.0) / Visual C++ 19.30 and up MSVC_VER = 17.0 |