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

QmlLivePreview: fix crash when inserting node with no parents

Browse Source 
Change-Id: Ib781f64aed11aafc106dc15b40689181fefd5dd3
Reviewed-on: http://codereview.qt.nokia.com/3171
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christiaan Janssen
2011-08-18 11:41:42 +02:00
parent 5396124dd7
commit 90a812a8a8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljsdelta.cpp
View File

@@ -511,6 +511,7 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P
if (!M.way2.contains(y)) { if (!M.way2.contains(y)) {
UiObjectMember* parent = parents2.parent.value(y); UiObjectMember* parent = parents2.parent.value(y);
if (parent) {
if ( parent->kind == QmlJS::AST::Node::Kind_UiArrayBinding ) if ( parent->kind == QmlJS::AST::Node::Kind_UiArrayBinding )
parent = parents2.parent.value(parent); parent = parents2.parent.value(parent);
@@ -519,6 +520,7 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P
qDebug () << "Delta::operator(): insert " << label(y, doc2) << " to " << label(parent, doc2); qDebug () << "Delta::operator(): insert " << label(y, doc2) << " to " << label(parent, doc2);
insert(y, parent, newDebuggIds.value(parent), doc2); insert(y, parent, newDebuggIds.value(parent), doc2);
} }
}
continue; continue;
} }
UiObjectMember *x = M.way2[y]; UiObjectMember *x = M.way2[y];