aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2014-04-16 17:12:16 +0200
committerMarco Bubke <marco.bubke@digia.com>2014-04-17 18:02:06 +0200
commit37b1dc871f7b30d22f6cbc3869d8b96755f12063 (patch)
treeaf4d4ca28ec8b35297b05fa85003c676d6e7a5bd /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
parentc7699c112105349123a94ff196bfadbdc3926411 (diff)
QmlDesigner: Merge GraphicalNodeInstance back in QuickItemNodeInstance
Change-Id: I2f5412887a66186d215e56101a63bacfda4f8e0a Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
index cacd54f154..c54770fa76 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
@@ -152,7 +152,7 @@ void ServerNodeInstance::setNodeSource(const QString &source)
bool ServerNodeInstance::holdsGraphical() const
{
- return m_nodeInstance->isGraphical();
+ return m_nodeInstance->isQuickItem();
}
void ServerNodeInstance::updateDirtyNodeRecursive()