QmlJS: Fix saving and restoring QML scope objects.

Change-Id: I621d7c3dbc8d5613b5d9ffddd08acd582559990b
Reviewed-on: http://codereview.qt-project.org/5720
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index 3d0ac107ed..92f90ab4a7 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -38,6 +38,8 @@
 #include "qmljsscopechain.h"
 #include "parser/qmljsast_p.h"
 
+#include <utils/qtcassert.h>
+
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
@@ -58,8 +60,11 @@ void ScopeBuilder::push(AST::Node *node)
     Node *qmlObject = cast<UiObjectDefinition *>(node);
     if (! qmlObject)
         qmlObject = cast<UiObjectBinding *>(node);
-    if (qmlObject)
+    if (qmlObject) {
+        // save the previous scope objects
+        _qmlScopeObjects.push(_scopeChain->qmlScopeObjects());
         setQmlScopeObject(qmlObject);
+    }
 
     // JS scopes
     switch (node->kind) {
@@ -114,9 +119,11 @@ void ScopeBuilder::pop()
     }
 
     // QML scope object
-    if (! _nodes.isEmpty()
-        && (cast<UiObjectDefinition *>(toRemove) || cast<UiObjectBinding *>(toRemove)))
-        setQmlScopeObject(_nodes.last());
+    if (cast<UiObjectDefinition *>(toRemove) || cast<UiObjectBinding *>(toRemove)) {
+        // restore the previous scope objects
+        QTC_ASSERT(!_qmlScopeObjects.isEmpty(), return);
+        _scopeChain->setQmlScopeObjects(_qmlScopeObjects.pop());
+    }
 }
 
 void ScopeBuilder::setQmlScopeObject(Node *node)