From 1014291c013d8b6f9f79e532c94bd73f22eaed58 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 24 Jun 2014 17:20:53 +0200 Subject: [PATCH] QmlDesigner: Fix rendering rendering of items The else clause was wrong. It should be that it is not a node instance but it was that it was not a dirty node instance. Change-Id: I657bbc03826edcb9a1ea46f9c3b44404b2d3f31a Reviewed-by: Tim Jenssen --- .../qml2puppet/instances/qt5rendernodeinstanceserver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp index 07d5c543b97..558092e2777 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp @@ -83,9 +83,9 @@ void Qt5RenderNodeInstanceServer::collectItemChangesAndSendChangeCommands() if (quickView() && nodeInstanceClient()->bytesToWrite() < 10000) { foreach (QQuickItem *item, allItems()) { if (item) { - if (hasInstanceForObject(item) - && DesignerSupport::isDirty(item, DesignerSupport::ContentUpdateMask)) { - m_dirtyInstanceSet.insert(instanceForObject(item)); + if (hasInstanceForObject(item)) { + if (DesignerSupport::isDirty(item, DesignerSupport::ContentUpdateMask)) + m_dirtyInstanceSet.insert(instanceForObject(item)); } else if (DesignerSupport::isDirty(item, DesignerSupport::AllMask)) { ServerNodeInstance ancestorInstance = findNodeInstanceForItem(item->parentItem()); if (ancestorInstance.isValid())