QmlDesigner: Fix preview rendering

We excluded item which had a node instance. For the preview all item should
be marked dirty.

Change-Id: I0cbad89707d7d94f65ac0d055488e124da40e7b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp

@@ -103,12 +103,9 @@ void GraphicalNodeInstance::createEffectItem(bool createEffectItem)
     s_createEffectItem = createEffectItem;
 }
 
-void GraphicalNodeInstance::updateDirtyNodeRecursive()
+void GraphicalNodeInstance::updateAllDirtyNodesRecursive()
 {
-    foreach (QQuickItem *childItem, quickItem()->childItems())
-            updateDirtyNodeRecursive(childItem);
-
-    DesignerSupport::updateDirtyNode(quickItem());
+    updateAllDirtyNodesRecursive(quickItem());
 }
 
 GraphicalNodeInstance::~GraphicalNodeInstance()
@@ -117,27 +114,27 @@ GraphicalNodeInstance::~GraphicalNodeInstance()
         designerSupport()->derefFromEffectItem(quickItem());
 }
 
-void GraphicalNodeInstance::updateDirtyNodeRecursive(QQuickItem *parentItem) const
+void GraphicalNodeInstance::updateDirtyNodesRecursive(QQuickItem *parentItem) const
 {
     foreach (QQuickItem *childItem, parentItem->childItems()) {
         if (!nodeInstanceServer()->hasInstanceForObject(childItem))
-            updateDirtyNodeRecursive(childItem);
+            updateDirtyNodesRecursive(childItem);
     }
 
     DesignerSupport::updateDirtyNode(parentItem);
 }
 
-void GraphicalNodeInstance::updateAllDirtyNodeRecursive(QQuickItem *parentItem) const
+void GraphicalNodeInstance::updateAllDirtyNodesRecursive(QQuickItem *parentItem) const
 {
     foreach (QQuickItem *childItem, parentItem->childItems())
-            updateDirtyNodeRecursive(childItem);
+            updateAllDirtyNodesRecursive(childItem);
 
     DesignerSupport::updateDirtyNode(parentItem);
 }
 
 QImage GraphicalNodeInstance::renderImage() const
 {
-    updateDirtyNodeRecursive(quickItem());
+    updateDirtyNodesRecursive(quickItem());
 
     QRectF renderBoundingRect = boundingRect();
 

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h

@@ -40,7 +40,7 @@ public:
 
     QList<ServerNodeInstance> childItems() const;
 
-    void updateDirtyNodeRecursive();
+    void updateAllDirtyNodesRecursive();
     static void createEffectItem(bool createEffectItem);
 
     int penWidth() const;
@@ -64,8 +64,8 @@ protected:
     void setHasContent(bool hasContent);
     DesignerSupport *designerSupport() const;
     Qt5NodeInstanceServer *qt5NodeInstanceServer() const;
-    void updateDirtyNodeRecursive(QQuickItem *parentItem) const;
-    void updateAllDirtyNodeRecursive(QQuickItem *parentItem) const;
+    void updateDirtyNodesRecursive(QQuickItem *parentItem) const;
+    void updateAllDirtyNodesRecursive(QQuickItem *parentItem) const;
     QRectF boundingRectWithStepChilds(QQuickItem *parentItem) const;
     void resetHorizontal();
     void resetVertical();

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

@@ -459,7 +459,7 @@ QVariant ObjectNodeInstance::fixResourcePaths(const QVariant &value)
     return value;
 }
 
-void ObjectNodeInstance::updateDirtyNodeRecursive()
+void ObjectNodeInstance::updateAllDirtyNodesRecursive()
 {
 }
 

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h

@@ -186,7 +186,7 @@ public:
 
     static QVariant fixResourcePaths(const QVariant &value);
 
-    virtual void updateDirtyNodeRecursive();
+    virtual void updateAllDirtyNodesRecursive();
 
 protected:
     explicit ObjectNodeInstance(QObject *object);

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp

@@ -158,7 +158,7 @@ bool ServerNodeInstance::holdsGraphical() const
 
 void ServerNodeInstance::updateDirtyNodeRecursive()
 {
-    m_nodeInstance->updateDirtyNodeRecursive();
+    m_nodeInstance->updateAllDirtyNodesRecursive();
 }
 
 bool ServerNodeInstance::isSubclassOf(const QString &superTypeName) const