summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-17 16:01:46 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-19 08:14:25 +0000
commit51bae0331c1fde52d0b3f1184d38a2be462ebd42 (patch)
tree400fd6ea93b81921d7f63f4944032a672fb3c8ea /configure.pri
parent38deb05109bcee9ad25a10eff024eaf8ce7a57f1 (diff)
Add qmake support for c++2a
Makes it possible to build user projects and Qt with C++2a. It is not automatically upgraded to yet though. Change-Id: I949ce94871ddc53f21b7265a52b9c0e1370456c8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index bfc0ca013f..81133da3d7 100644
--- a/configure.pri
+++ b/configure.pri
@@ -20,12 +20,20 @@ defineTest(qtConfCommandline_cxxstd) {
!contains(val, "^-.*"):!isEmpty(val) {
contains(val, "(c\+\+)?11") {
qtConfCommandlineSetInput("c++14", "no")
+ qtConfCommandlineSetInput("c++1z", "no")
+ qtConfCommandlineSetInput("c++2a", "no")
} else: contains(val, "(c\+\+)?(14|1y)") {
qtConfCommandlineSetInput("c++14", "yes")
qtConfCommandlineSetInput("c++1z", "no")
+ qtConfCommandlineSetInput("c++2a", "no")
} else: contains(val, "(c\+\+)?(17|1z)") {
qtConfCommandlineSetInput("c++14", "yes")
qtConfCommandlineSetInput("c++1z", "yes")
+ qtConfCommandlineSetInput("c++2a", "no")
+ } else: contains(val, "(c\+\+)?(2a)") {
+ qtConfCommandlineSetInput("c++14", "yes")
+ qtConfCommandlineSetInput("c++1z", "yes")
+ qtConfCommandlineSetInput("c++2a", "yes")
} else {
qtConfAddError("Invalid argument $$val to command line parameter $$arg")
}