From 38deb05109bcee9ad25a10eff024eaf8ce7a57f1 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 17 Apr 2019 15:45:58 +0200 Subject: 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 --- configure.pri | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'configure.pri') 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 { -- cgit v1.2.3