From 46cb5a4dce74671efed44ba45e10472795d9813f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 4 Aug 2016 19:05:09 +0200 Subject: 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 --- mkspecs/features/qt_configure.prf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mkspecs') 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)) } -- cgit v1.2.3