diff options
| -rw-r--r-- | configure.json | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 |
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)) } |