diff options
| author | Marco Bubke <marco.bubke@nokia.com> | 2011-07-11 16:24:17 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-07-11 16:30:53 +0200 |
| commit | 668bfe69ded871da441b2e01dbb8aa58cdc9f244 (patch) | |
| tree | 6a85447e42824b69bb8f6473d69ed863124acd86 | |
| parent | 379473366038c378ea18dfff32b82446231d6f7d (diff) | |
QmlDesigner.NodeInstances: Fix workaround
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>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp index 4df007a8656..b97f9b7e1cd 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp @@ -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); |