Amend property evaluation optimization.v1.3.4

There is code further down in the chain (e.g. setupBuildEnvironment())
that expects the first module instance it finds to contain the right
definition for all its properties. So make sure that is the case.

Change-Id: I55f10d626f5be7ec8502f54e0b1a9673df0b5d93
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index cffe6b074..83d661c14 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -1183,11 +1183,13 @@ QVariantMap ProjectResolver::evaluateProperties(Item *item,
             const bool isOwnProperty = std::binary_search(evalContext.ownProperties.constBegin(),
                     evalContext.ownProperties.constEnd(), it.key());
             if (isPotentialGlobalEntry) {
-                const QHash<QString, EvalResult>::ConstIterator it
+                const QHash<QString, EvalResult>::ConstIterator globalIt
                         = evalContext.globalResult->find(fullKey);
-                if (it != evalContext.globalResult->constEnd()) {
-                    if (!isOwnProperty || it->strongPrecedence)
+                if (globalIt != evalContext.globalResult->constEnd()) {
+                    if (!isOwnProperty || globalIt->strongPrecedence) {
+                        result[it.key()] = globalIt->value;
                         break;
+                    }
                 }
             }