diff options
author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-08-18 15:54:13 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-29 08:36:26 +0000 |
commit | f465a59fcd181d94b77eeb821485a8bc39ae960e (patch) | |
tree | f3b9162b63edd5b96a1f5e22ea391dd87f8e7560 /src | |
parent | 33d36b3f2f8c2a9e28542f423d33385b0cb8f372 (diff) |
Fix file scope for Properties conditions
The file scope must correspond to the file where the Properties item is
instantiated, because that's where the imports need to be looked up.
Change-Id: Icfc0fd30bd43ee069ec7a4d2ea1a1e9b88560b2d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/corelib/language/evaluatorscriptclass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index ecd7890db..8230d3990 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -177,7 +177,7 @@ private: ? data->item->scope() : data->item; conditionScope = data->evaluator->scriptValue(conditionScopeItem); QBS_ASSERT(conditionScope.isObject(), return); - conditionFileScope = data->evaluator->fileScope(conditionScopeItem->file()); + conditionFileScope = data->evaluator->fileScope(value->file()); } engine->currentContext()->pushScope(conditionFileScope); pushItemScopes(conditionScopeItem); |