diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-11 15:13:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-12 09:28:47 +0000 |
| commit | 65d5bfc63d04bb1a0719183501c918b7a3d44cfe (patch) | |
| tree | b1ce64cbd9d846ff28b2923bc1255b100cf1d258 /mkspecs | |
| parent | 05fd7f8d902eb736f3f5f96b2f5b3af1fe54c439 (diff) | |
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 <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
1 files changed, 1 insertions, 1 deletions
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) |