1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: fix c++17 detection on windows

Browse Source 
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>
This commit is contained in:
Lorn Potter 2019-10-28 18:49:17 +10:00
parent b36b7abb40
commit 4df303ece7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.json
View File

@ -322,7 +322,7 @@
"qmake": "CONFIG += c11" "qmake": "CONFIG += c11"
} }
}, },
"c++14": { "cxx14": {
"label": "C++14 support", "label": "C++14 support",
"type": "compile", "type": "compile",
"test": { "test": {
@ -336,7 +336,7 @@
"qmake": "CONFIG += c++11 c++14" "qmake": "CONFIG += c++11 c++14"
} }
}, },
"c++17": { "cxx17": {
"label": "C++17 support", "label": "C++17 support",
"type": "compile", "type": "compile",
"test": { "test": {
@ -357,7 +357,7 @@
"qmake": "CONFIG += c++11 c++14 c++17" "qmake": "CONFIG += c++11 c++14 c++17"
} }
}, },
"c++2a": { "cxx2a": {
"label": "C++2a support", "label": "C++2a support",
"type": "compile", "type": "compile",
"test": { "test": {
@ -963,12 +963,12 @@
}, },
"c++14": { "c++14": {
"label": "C++14", "label": "C++14",
"condition": "features.c++11 && tests.c++14", "condition": "features.c++11 && tests.cxx14",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"c++17": { "c++17": {
"label": "C++17", "label": "C++17",
"condition": "features.c++14 && tests.c++17", "condition": "features.c++14 && tests.cxx17",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"c++1z": { "c++1z": {
@ -979,7 +979,7 @@
"c++2a": { "c++2a": {
"label": "C++2a", "label": "C++2a",
"autoDetect": false, "autoDetect": false,
"condition": "features.c++17 && tests.c++2a", "condition": "features.c++17 && tests.cxx2a",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"c89": { "c89": {