diff options
| -rw-r--r-- | config_help.txt | 4 | ||||
| -rw-r--r-- | configure.json | 4 | ||||
| -rw-r--r-- | configure.pri | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/config_help.txt b/config_help.txt index 8eea64e03a..d63f9be5f8 100644 --- a/config_help.txt +++ b/config_help.txt @@ -139,8 +139,8 @@ Build options: -coverage {trace-pc-guard} Add code coverage instrumentation (Clang only) - -c++std <edition> .... Select C++ standard <edition> [c++1z/c++14/c++11] - (Not supported with MSVC) + -c++std <edition> .... Select C++ standard <edition> [c++17/c++14/c++11] + (Not supported with MSVC 2015) -sse2 ................ Use SSE2 instructions [auto] -sse3/-ssse3/-sse4.1/-sse4.2/-avx/-avx2/-avx512 diff --git a/configure.json b/configure.json index f7449ec068..da8308a80c 100644 --- a/configure.json +++ b/configure.json @@ -319,7 +319,7 @@ } }, "c++1z": { - "label": "C++1z support", + "label": "C++17 support", "type": "compile", "test": { "head": [ @@ -907,7 +907,7 @@ "output": [ "publicFeature", "publicQtConfig" ] }, "c++1z": { - "label": "C++1z", + "label": "C++17", "condition": "features.c++14 && tests.c++1z", "output": [ "publicFeature", "publicQtConfig" ] }, diff --git a/configure.pri b/configure.pri index d8d0260fa0..bfc0ca013f 100644 --- a/configure.pri +++ b/configure.pri @@ -14,9 +14,6 @@ defineTest(qtConfCommandline_qmakeArgs) { } defineTest(qtConfCommandline_cxxstd) { - msvc: \ - qtConfAddError("Command line option -c++std is not supported with MSVC compilers.") - arg = $${1} val = $${2} isEmpty(val): val = $$qtConfGetNextCommandlineArg() @@ -26,7 +23,7 @@ defineTest(qtConfCommandline_cxxstd) { } else: contains(val, "(c\+\+)?(14|1y)") { qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++1z", "no") - } else: contains(val, "(c\+\+)?(1z)") { + } else: contains(val, "(c\+\+)?(17|1z)") { qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++1z", "yes") } else { |