diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-17 15:45:58 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-18 22:26:27 +0000 |
| commit | 38deb05109bcee9ad25a10eff024eaf8ce7a57f1 (patch) | |
| tree | f31b59cae085588e5d405d3f32cabbbae592b293 /configure.pri | |
| parent | 8ae8c6690b41f6cd40dae14d471ce29b500c66c9 (diff) | |
| download | qtbase-38deb05109bcee9ad25a10eff024eaf8ce7a57f1.tar.gz | |
Rename c++1z to c++17 in the configure api
It is 2019, so the name c++17 is more than fixed by now.
At the same time remove an old restriction on using -c++std= with MSVC,
since VS2017 (15.7), we have been able to request c++14 and c++17.
Change-Id: I7129799a2e46301b7ec1322251a3805f4d6b20a8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 5 |
1 files changed, 1 insertions, 4 deletions
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 { |