From 65d5bfc63d04bb1a0719183501c918b7a3d44cfe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Oct 2016 15:13:03 +0200 Subject: fix referencing libs fields dispatched to the selected source the field was "over-expanded", which led to always querying the non-existing source with an empty name. this broke the handcrafted openssl library export which uses the feature. amends c0cc50520. Task-number: QTBUG-55530 Change-Id: Id019fcb3e7adcecaf47d7a65820179da1617c0f7 Reviewed-by: Timur Pocheptsov Reviewed-by: Jake Petroules Reviewed-by: Kai Koehne --- mkspecs/features/qt_configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 7f575b8a1b..8867785335 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1006,7 +1006,7 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Unknown library object $${lib} in expression '$${1}'.") qtConfHandleLibrary($$lib) !defined($${currentConfig}.libraries.$${lib}.$${var}, var): \ - var = sources.$$eval($${currentConfig}.libraries.$${lib}.$${source}).$$var + var = sources.$$eval($${currentConfig}.libraries.$${lib}.source).$$var result = $$eval($${currentConfig}.libraries.$${lib}.$${var}) } else: contains(e, "^features\..*") { feature = $$section(e, ".", 1, 1) -- cgit v1.2.3