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 /mkspecs | |
| 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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 7 |
1 files changed, 4 insertions, 3 deletions
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): \ |