aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-05-09 17:11:24 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-05-12 11:33:30 +0200
commitffc982bdc4bf04c95ccf0a56d06ce4f58f1db370 (patch)
tree54c173f7908970929bc2882a8fd3d034e7625f56
parent62e4d6ef5c9533fb4623a32db99d9c148c997a5a (diff)
fix PathProbe
We must push the probe's scope last, because otherwise the file scope would shadow property names like fileName and filePath. Task-number: QBS-383 Change-Id: I4c78b6ad65c2f3e9af5c5c4dda721f6bb6475324 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/lib/corelib/language/moduleloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index ba11840ad..abe09814c 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -972,8 +972,8 @@ void ModuleLoader::resolveProbe(Item *parent, Item *probe)
}
QScriptValue scope = m_engine->newObject();
m_engine->currentContext()->pushScope(m_evaluator->scriptValue(parent));
- m_engine->currentContext()->pushScope(scope);
m_engine->currentContext()->pushScope(m_evaluator->fileScope(configureScript->file()));
+ m_engine->currentContext()->pushScope(scope);
foreach (const ProbeProperty &b, probeBindings)
scope.setProperty(b.first, b.second);
QScriptValue sv = m_engine->evaluate(configureScript->sourceCodeForEvaluation());