diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-05 16:13:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-07 21:17:00 +0000 |
| commit | 074b9f1eef6ec48ed66db14699dbc74141fa63b5 (patch) | |
| tree | bea68f11b20a7fe08ca7e5197e4b2ee038adc3bb | |
| parent | 86ccc843574eb57c6bb6d68e96c56b7cbcbb66f0 (diff) | |
Make reported build type match old configure
Adds platform and CPU features to the reported build type,
matching the format of the old configure.
Started-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6d93ec7416b38684da51af5238a5cf537810b21d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | configure.pri | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 19719736a9..dc749cd6d4 100644 --- a/configure.pri +++ b/configure.pri @@ -510,12 +510,19 @@ defineTest(qtConfReport_buildParts) { qtConfReportPadded($${1}, $$qtConfEvaluate("tests.build_parts.value")) } +defineReplace(qtConfReportArch) { + arch = $$qtConfEvaluate('tests.$${1}.arch') + subarch = $$qtConfEvaluate('tests.$${1}.subarch') + isEmpty(subarch): subarch = <none> + return("$$arch, CPU features: $$subarch") +} + defineTest(qtConfReport_buildTypeAndConfig) { !$$qtConfEvaluate("features.cross_compile") { - qtConfAddReport("Build type: $$qtConfEvaluate('tests.architecture.arch')") + qtConfAddReport("Build type: $$[QMAKE_SPEC] ($$qtConfReportArch(architecture))") } else { - qtConfAddReport("Building on: $$qtConfEvaluate('tests.host_architecture.arch')") - qtConfAddReport("Building for: $$qtConfEvaluate('tests.architecture.arch')") + qtConfAddReport("Building on: $$[QMAKE_SPEC] ($$qtConfReportArch(host_architecture))") + qtConfAddReport("Building for: $$[QMAKE_XSPEC] ($$qtConfReportArch(architecture))") } qtConfAddReport() qtConfAddReport("Configuration: $$eval($${currentConfig}.output.privatePro.append.CONFIG) $$eval($${currentConfig}.output.publicPro.append.QT_CONFIG)") |