diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2019-10-28 18:49:17 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2020-01-30 13:59:23 +1000 |
| commit | 4df303ece7ce69a0e8dc2d14b59637048d7214ec (patch) | |
| tree | 1f8850b267166bde422d3f553cfb947b9a657cff | |
| parent | b36b7abb40f04f265c0453a2f4beb466ed462976 (diff) | |
wasm: fix c++17 detection on windows
Our copy function for qtloader.js does not handle quoting when a
directory has '+' in the path, and this makes the copy method fail.
This is fixed the same way the cxx_future test works
Fixes: QTBUG-79552
Change-Id: Iad8331800aa73eea948e7d2650568645a4c0640c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | configure.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.json b/configure.json index 96cca22b31..0bf0e6d4e5 100644 --- a/configure.json +++ b/configure.json @@ -322,7 +322,7 @@ "qmake": "CONFIG += c11" } }, - "c++14": { + "cxx14": { "label": "C++14 support", "type": "compile", "test": { @@ -336,7 +336,7 @@ "qmake": "CONFIG += c++11 c++14" } }, - "c++17": { + "cxx17": { "label": "C++17 support", "type": "compile", "test": { @@ -357,7 +357,7 @@ "qmake": "CONFIG += c++11 c++14 c++17" } }, - "c++2a": { + "cxx2a": { "label": "C++2a support", "type": "compile", "test": { @@ -963,12 +963,12 @@ }, "c++14": { "label": "C++14", - "condition": "features.c++11 && tests.c++14", + "condition": "features.c++11 && tests.cxx14", "output": [ "publicFeature", "publicQtConfig" ] }, "c++17": { "label": "C++17", - "condition": "features.c++14 && tests.c++17", + "condition": "features.c++14 && tests.cxx17", "output": [ "publicFeature", "publicQtConfig" ] }, "c++1z": { @@ -979,7 +979,7 @@ "c++2a": { "label": "C++2a", "autoDetect": false, - "condition": "features.c++17 && tests.c++2a", + "condition": "features.c++17 && tests.cxx2a", "output": [ "publicFeature", "publicQtConfig" ] }, "c89": { |