Fix incorrect scope resolution for script in a script block.

Make sure global variables in a script file are searched before
component properties.

Task-number: QTBUG-8641

1 files changed, 1 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index b244cd8..57ef90c 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -78,6 +78,7 @@ void QDeclarativeContextPrivate::addScript(const QDeclarativeParser::Object::Scr
     
     QScriptValue scope = scriptEngine->newObject();
     scriptContext->setActivationObject(scope);
+    scriptContext->pushScope(scope);
 
     for (int ii = 0; ii < script.codes.count(); ++ii) {
         scriptEngine->evaluate(script.codes.at(ii), script.files.at(ii), script.lineNumbers.at(ii));