summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-04 19:05:09 +0200
committerLars Knoll <lars.knoll@qt.io>2016-08-10 15:43:29 +0000
commit46cb5a4dce74671efed44ba45e10472795d9813f (patch)
tree940c2187ba016c7f73a834ee3a9c5ab5f21f8fad
parent4f8b40d74e1840f9e9c266dd86bdd907d2959287 (diff)
make it impossible to lie about the feature an output belongs to
overriding an output's 'feature' field would just lead to confusing error messages. the right way is setting the 'name' field. adjust the 'dbus' library output to this policy. Change-Id: I912133f3a0a50fc55f2e16a1ed6bfa464aae8d88 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--configure.json2
-rw-r--r--mkspecs/features/qt_configure.prf4
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.json b/configure.json
index 6f12123cae..6f4ab05499 100644
--- a/configure.json
+++ b/configure.json
@@ -1788,7 +1788,7 @@
"condition": "features.dbus && tests.dbus",
"output": [
"publicQtConfig",
- { "type": "library", "feature": "dbus", "test": "dbus" }
+ { "type": "library", "name": "dbus", "test": "dbus" }
]
},
"host-dbus": {
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 84891a83e5..b2d1817d16 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1134,15 +1134,13 @@ defineTest(qtConfProcessOneOutput) {
!defined("qtConfOutput_$$call", test): \
error("Undefined type '$$call' in output '$$2' of feature '$$feature'.")
- isEmpty($${opfx}.feature): \
- $${opfx}.feature = $$feature
-
condition = $$eval($${opfx}.condition)
!isEmpty(condition) {
!$$qtConfEvaluate($$condition): \
return(false)
}
+ $${opfx}.feature = $$feature
qtConfOutput_$${call}($$opfx, $$eval($${fpfx}.available))
}