diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-08 18:46:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-22 07:46:05 +0000 |
| commit | 7509ccc0f7020a313fcd04447ab3f9b8ff1a548d (patch) | |
| tree | ae0be580e269c24d50c2ce6cc8b3d60a9c952477 /mkspecs | |
| parent | 5e2367aaa5137f27c722cd7f8474696b0fbaa099 (diff) | |
add configure -list-features
also actually deletes qfeatures.txt, which was already claimed by
a668c6a6, but not actually done.
Task-number: QTBUG-58411
Change-Id: I686760632fee7c10b01bd2e83f2481b01bc2b774
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/data/configure.json | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 30 |
2 files changed, 27 insertions, 7 deletions
diff --git a/mkspecs/features/data/configure.json b/mkspecs/features/data/configure.json index 98ccde1ee3..c4e33d0188 100644 --- a/mkspecs/features/data/configure.json +++ b/mkspecs/features/data/configure.json @@ -12,7 +12,9 @@ "recheck": { "type": "void", "name": "cache_use", "value": "positive" }, "recheck-all": { "type": "void", "name": "cache_use", "value": "none" }, - "redo": { "type": "redo" } + "redo": { "type": "redo" }, + + "list-features": "void" } } } diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index b1c8d5b33a..5c895bcde3 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1258,14 +1258,14 @@ defineTest(qtConfProcessFeatures) { # reporting # -QT_CONF_REPORT_PADDING = "........................................" - -defineTest(qtConfReportPadded) { - pad = $$num_add($$str_size($$QT_CONF_REPORT_PADDING), -$$str_size($${1})) +defineReplace(qtConfPadCols) { + pad = $$num_add($$str_size($$2), -$$str_size($${1})) lessThan(pad, 0): pad = 0 - str = "$$1 $$str_member($$QT_CONF_REPORT_PADDING, 0, $$pad)" + return("$$1 $$str_member($$2, 0, $$pad) $$3") +} - qtConfAddReport("$$str $${2}") +defineTest(qtConfReportPadded) { + qtConfAddReport($$qtConfPadCols($$1, "........................................", $$2)) } defineReplace(qtConfCollectFeatures) { @@ -1783,6 +1783,24 @@ QMAKE_REDO_CONFIG = false qtConfParseCommandLine() qtConfCheckErrors() +!isEmpty(config.input.list-features) { + all_ft = + for (currentConfig, allConfigs) { + for (k, $${currentConfig}.features._KEYS_) { + pp = $$eval($${currentConfig}.features.$${k}.purpose) + !isEmpty(pp) { + all_ft += $$qtConfPadCols($$k, ".......................", \ + $$section(pp, $$escape_expand(\\n), 0, 0)) + } + } + } + all_ft = $$sorted(all_ft) + logn() + for (ft, all_ft): \ + logn($$ft) + error() +} + for (currentConfig, allConfigs) { qtConfSetModuleName() qtConfSetupModuleOutputs() |