summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-26 21:10:56 +0200
committerLars Knoll <lars.knoll@qt.io>2016-09-15 08:24:00 +0000
commitb754b2815d342334f335816b901c051940954942 (patch)
tree8c51eb3d20a19ca558de24c6a86816cf1ced5562 /mkspecs
parent2d3c73fcfe7a93cb46190e8e82410fe93145dbe0 (diff)
rename description => label in configure.json
"description" suggests something slightly longer. this may seem like a gratuitous change, but the upcoming replacement of the old feature system clarifies makes it seem much less so. Change-Id: Ibe702e01cb146b59127bf1f990b4acaef1c61d55 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_configure.prf14
1 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 79fede1525..af8a0e259d 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -777,17 +777,17 @@ defineTest(logn) {
}
defineTest(qtLogTestIntro) {
- description = $$eval($${1}.description)
- isEmpty(description): return()
+ label = $$eval($${1}.label)
+ isEmpty(label): return()
- msg = "Checking for $${description}... "
+ msg = "Checking for $${label}... "
log($$msg)
$$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)")
write_file($$QMAKE_CONFIG_LOG, msg, append)
}
defineTest(qtLogTestResult) {
- isEmpty($${1}.description): return()
+ isEmpty($${1}.label): return()
!isEmpty($${1}.log) {
field = $$eval($${1}.log)
@@ -1198,7 +1198,7 @@ defineReplace(qtConfCollectFeatures) {
l =
for (feature, $$list($${1})) {
$$eval($${currentConfig}.features.$${feature}.available): \
- l += $$eval($${currentConfig}.features.$${feature}.description)
+ l += $$eval($${currentConfig}.features.$${feature}.label)
}
isEmpty(l): return("<none>")
@@ -1214,7 +1214,7 @@ defineReplace(qtConfFindFirstAvailableFeature) {
isEmpty($${currentConfig}.features.$${feature}._KEYS_): \
error("Asking for a report on undefined feature $${2}.")
$$eval($${currentConfig}.features.$${feature}.available): \
- return($$eval($${currentConfig}.features.$${feature}.description))
+ return($$eval($${currentConfig}.features.$${feature}.label))
}
return("<none>")
@@ -1240,7 +1240,7 @@ defineTest(qtConfReport_feature) {
!isEmpty(4): result = "$${4}"
}
- text = $$eval($${currentConfig}.features.$${2}.description)
+ text = $$eval($${currentConfig}.features.$${2}.label)
qtConfReportPadded($${1}$$text, $$result)
}