diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-08-26 12:00:50 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-08-30 14:14:42 +0200 |
| commit | da1da999f49b3e694a39c3bb356c942f50679760 (patch) | |
| tree | 28bd17aa520567cccef6bb7e313693b33a4abc91 /mkspecs | |
| parent | ede7f85c07551c3b429a7e71a2cee47d32a553fb (diff) | |
qmake: Add support for C17/C18
Make it possible to select the C17/C18 standard with
CONFIG += c17
or
CONFIG += c18
Fixes: QTBUG-96026
Change-Id: I719d22366c3efda009118d58ead173a25ed285c0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9004575f4b2aee7bf3c55522affd10555d134c51)
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/msvc-version.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/default_post.prf | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 99d77156fd..fa65c1dd37 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -86,6 +86,7 @@ QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG -fuse-linker-plugin QMAKE_CFLAGS_C99 = -std=c99 QMAKE_CFLAGS_C11 = -std=c11 +QMAKE_CFLAGS_C17 = -std=c17 QMAKE_CFLAGS_SSE2 += -msse2 QMAKE_CFLAGS_SSE3 += -msse3 diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index e17c30a231..24a92ee147 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -125,6 +125,7 @@ greaterThan(QMAKE_MSC_VER, 1927) { # Visual Studio 2019 (16.8 or 16.9) / Visual C++ 19.28 and up MSVC_VER = 16.8 QMAKE_CFLAGS_C11 = /std:c11 + QMAKE_CFLAGS_C17 = /std:c17 } !isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 1d79f5c958..462dbf7774 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -155,7 +155,8 @@ c++11|c++14|c++1z|c++2a { unset(cxxstd) } -c99|c11 { +c99|c11|c17|c18 { + c17|c18: cstd = C17 c11: cstd = C11 else: cstd = C99 |