summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.json6
-rw-r--r--mkspecs/features/qt_configure.prf2
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.json b/configure.json
index a76fec06ee..ad284526ff 100644
--- a/configure.json
+++ b/configure.json
@@ -1177,17 +1177,17 @@
"output": [ "publicQtConfig" ]
},
"c++11": {
- "description": "C++11 support",
+ "description": "C++11",
"condition": "tests.c++11",
"output": [ "publicQtConfig" ]
},
"c++14": {
- "description": "C++14 support",
+ "description": "C++14",
"condition": "features.c++11 && tests.c++14",
"output": [ "publicQtConfig" ]
},
"c++1z": {
- "description": "C++1z support",
+ "description": "C++1z",
"condition": "features.c++14 && tests.c++1z",
"output": [ "publicQtConfig" ]
},
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 081dddc9fb..43be04aa62 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -785,7 +785,7 @@ defineReplace(qtConfFindFirstAvailableFeature) {
isEmpty(config.features.$${feature}._KEYS_): \
error("Asking for a report on undefined feature $${2}.")
$$eval(config.features.$${feature}.available): \
- return($$feature)
+ return($$eval(config.features.$${feature}.description))
}
return("<none>")