aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2014-06-24 17:20:53 +0200
committerMarco Bubke <marco.bubke@digia.com>2014-06-24 19:39:16 +0200
commit1014291c013d8b6f9f79e532c94bd73f22eaed58 (patch)
tree2153eeecba6c81558d92ab6d57b80e2592b2b455 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
parent05d5b9c3ec3a10760b15d013996c6e9c62f86405 (diff)
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 <tim.jenssen@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp6
1 files 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 07d5c543b9..558092e277 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())