diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-14 17:40:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-22 10:28:03 +0000 |
| commit | b451a6e514980503d727c43a6bf78f1a447f872d (patch) | |
| tree | 3ebbf7c7a853ae8fdc90cce022f08a23f238518f | |
| parent | 2b78a49f221b78418bcfb8cdcbe88ed0e3ecbbfe (diff) | |
make 'feature' report type always use the feature descriptions
they are really meant for pretty-printing the summary in the first
place, and were previously unused when this type was invoked explicitly
(because of using a condition).
adjust the neon/mips_dsp/mips_dspr2 descriptions to match the context
and remove the now redundant "message" fields.
Change-Id: I08558f342a0d9189a37145085e5470f91a9d0881
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | configure.json | 12 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/configure.json b/configure.json index ad284526ff..a83408d310 100644 --- a/configure.json +++ b/configure.json @@ -1378,7 +1378,7 @@ ] }, "mips_dsp": { - "description": "Support for MIPS DSP instructions", + "description": "DSP", "condition": "arch.mips && tests.mips_dsp", "output": [ "privateConfig", @@ -1386,7 +1386,7 @@ ] }, "mips_dspr2": { - "description": "Support for MIPS DSPr2 instructions", + "description": "DSPr2", "condition": "arch.mips && tests.mips_dspr2", "output": [ "privateConfig", @@ -1394,7 +1394,7 @@ ] }, "neon": { - "description": "Support for NEON instructions", + "description": "NEON", "condition": "(arch.arm || arch.arm64) && tests.neon", "output": [ "privateConfig", @@ -2365,19 +2365,16 @@ Please apply the patch corresponding to your Standard Library vendor, found in "condition": "(arch.i386 || arch.x86_64)" }, { - "message": "NEON", "type": "feature", "args": "neon", "condition": "arch.arm || arch.arm64" }, { - "message": "DSP", "type": "feature", "args": "mips_dsp", "condition": "arch.mips" }, { - "message": "DSPr2", "type": "feature", "args": "mips_dspr2", "condition": "arch.mips" @@ -2410,7 +2407,6 @@ Please apply the patch corresponding to your Standard Library vendor, found in "alsa", "cups", { - "message": "DirectWrite", "type": "feature", "args": "directwrite", "condition": "config.win32" @@ -2447,14 +2443,12 @@ Please apply the patch corresponding to your Standard Library vendor, found in "section": "Networking", "entries": [ { - "message": "CoreWLan", "type": "feature", "args": "corewlan", "condition": "config.darwin" }, "getaddrinfo", "getifaddrs", "ipv6ifname", "libproxy", { - "message": "SecureTransport", "type": "feature", "args": "securetransport", "condition": "config.darwin" diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 43be04aa62..0e3c8a6544 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -811,7 +811,9 @@ defineTest(qtConfReport_feature) { !isEmpty(4): result = "$${4}" } - qtConfReportPadded($${1}, $$result) + text = $$eval(config.features.$${2}.description) + + qtConfReportPadded($${1}$$text, $$result) } defineTest(qtConfReport_note) { @@ -854,8 +856,7 @@ defineTest(qtConfCreateReportRecurse) { qtConfCreateReportRecurse("$${entry}.entries", "$$indent ") } else: !isEmpty($${entry}) { feature = $$eval($${entry}) - text = $$eval(config.features.$${feature}.description) - qtConfReport_feature($$indent$$text, $$feature) + qtConfReport_feature($$indent, $$feature) } else { text = $$eval($${entry}.message) isEmpty($${entry}.type): \ |