summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-11-02 15:15:19 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-11-07 13:02:02 +0000
commit66ad9668f3158ab5a0ee8f93fe3ddf062e37967e (patch)
treec72a9e6e9929635ecd14f24a439513c44d9f7123
parent890a4d40ecd384ba4f59643374948a6fdddb741a (diff)
fix iteration over a feature's outputs
use precalculated path instead of incorrectly assembling it from scratch. it accidentally worked when the features happened to be in the right order, as the iteration variable 'feature' from the calling function was inherited. however, if the feature was accessed via dependency resolution, things blew up. amends 90eee08b3e, which presumably came to be this way due to a missing adjustment to a refactoring. Change-Id: I78b0acc0682cfc27a458df014ce14262a65c6241 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--mkspecs/features/qt_configure.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index bfc460edca..1d7e810cc8 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1182,8 +1182,8 @@ defineTest(qtConfCheckFeature) {
$${fpfx}.available = $$result
export($${fpfx}.available)
- for (i, $${currentConfig}.features.$${feature}.output._KEYS_): \
- qtConfProcessOneOutput($$feature, $$i)
+ for (i, $${fpfx}.output._KEYS_): \
+ qtConfProcessOneOutput($${1}, $$i)
return(true)
}