AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make firstAvailableFeature report type use the feature descriptions

Browse Source 
they are really meant for pretty-printing the summary in the first
place, and were previously unused for this type.
adjust the c++* descriptions to match the context.

Change-Id: I2a76b5651892bf9bd6fec315e446bfdb7c3aee97
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-07-14 17:40:41 +02:00
parent caf51ee0dd
commit 2b78a49f22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.json
View File

@ -1177,17 +1177,17 @@
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"c++11": { "c++11": {
"description": "C++11 support", "description": "C++11",
"condition": "tests.c++11", "condition": "tests.c++11",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"c++14": { "c++14": {
"description": "C++14 support", "description": "C++14",
"condition": "features.c++11 && tests.c++14", "condition": "features.c++11 && tests.c++14",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"c++1z": { "c++1z": {
"description": "C++1z support", "description": "C++1z",
"condition": "features.c++14 && tests.c++1z", "condition": "features.c++14 && tests.c++1z",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },

2
mkspecs/features/qt_configure.prf
View File

@ -785,7 +785,7 @@ defineReplace(qtConfFindFirstAvailableFeature) {
isEmpty(config.features.$${feature}._KEYS_): \ isEmpty(config.features.$${feature}._KEYS_): \
error("Asking for a report on undefined feature $${2}.") error("Asking for a report on undefined feature $${2}.")
$$eval(config.features.$${feature}.available): \ $$eval(config.features.$${feature}.available): \
return($$feature) return($$eval(config.features.$${feature}.description))
} }
return("<none>") return("<none>")