From 2b78a49f221b78418bcfb8cdcbe88ed0e3ecbbfe Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 14 Jul 2016 17:40:41 +0200
Subject: make firstAvailableFeature report type use the feature descriptions

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>
---
 configure.json                    | 6 +++---
 mkspecs/features/qt_configure.prf | 2 +-
 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>")
-- 
cgit v1.2.3