feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix saving and restoring QML scope objects.

Browse Source 
Change-Id: I621d7c3dbc8d5613b5d9ffddd08acd582559990b
Reviewed-on: http://codereview.qt-project.org/5720
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-28 15:15:09 +02:00
parent 373d51a1ed
commit 8faafc2f0c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/qmljs/qmljsscopebuilder.cpp
View File

@@ -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)