diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 16:43:14 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 16:43:14 +0300 |
| commit | 29400a683f96867133b28299c0d0bd6bcf40df35 (patch) | |
| tree | b616dfb91ce111d61a34a67b28069561306575da /configure.pri | |
| parent | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (diff) | |
| parent | 9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: Ic1bb4240ca70a8a361fa0267476707446579221d
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 63d6b3f278..365a16403e 100644 --- a/configure.pri +++ b/configure.pri @@ -22,18 +22,27 @@ defineTest(qtConfCommandline_cxxstd) { qtConfCommandlineSetInput("c++14", "no") qtConfCommandlineSetInput("c++1z", "no") qtConfCommandlineSetInput("c++2a", "no") + qtConfCommandlineSetInput("c++2b", "no") } else: contains(val, "(c\+\+)?(14|1y)") { qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++1z", "no") qtConfCommandlineSetInput("c++2a", "no") + qtConfCommandlineSetInput("c++2b", "no") } else: contains(val, "(c\+\+)?(17|1z)") { qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++1z", "yes") qtConfCommandlineSetInput("c++2a", "no") + qtConfCommandlineSetInput("c++2b", "no") } else: contains(val, "(c\+\+)?(2a)") { qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++1z", "yes") qtConfCommandlineSetInput("c++2a", "yes") + qtConfCommandlineSetInput("c++2b", "no") + } else: contains(val, "(c\+\+)?(2b)") { + qtConfCommandlineSetInput("c++14", "yes") + qtConfCommandlineSetInput("c++1z", "yes") + qtConfCommandlineSetInput("c++2a", "yes") + qtConfCommandlineSetInput("c++2b", "yes") } else { qtConfAddError("Invalid argument $$val to command line parameter $$arg") } |