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

QmlDesigner.NodeInstances: Fix workaround

Browse Source 
componentComplete after reparent was null.

Change-Id: Ic4705531a38f67e706bc58a27d423d4062f83304
Reviewed-on: http://codereview.qt.nokia.com/1425
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Marco Bubke
2011-07-11 16:24:17 +02:00
committed by Thomas Hartmann
parent 3794733660
commit 668bfe69de
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp
View File

@@ -314,9 +314,10 @@ void QmlGraphicsItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &ol
setMovable(true);
}
bool componentComplete = QDeclarativeItemPrivate::get(qmlGraphicsItem())->componentComplete;
QDeclarativeItemPrivate::get(qmlGraphicsItem())->componentComplete = 1;
GraphicsObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty);
QDeclarativeItemPrivate::get(qmlGraphicsItem())->componentComplete = 0;
QDeclarativeItemPrivate::get(qmlGraphicsItem())->componentComplete = componentComplete;
if (newParentInstance && newParentInstance->isPositioner()) {
setInPositioner(true);