From 6ea355add165ef78eba33ad1d5240c60757e51bb Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 6 May 2011 13:14:14 +0200
Subject: [PATCH] QmlDesigner.instanceView: do not skip Models anymore
We only skip Model if they are the root node.
I kept the isSkippedNode since it might become useful again.
---
.../designercore/instances/nodeinstanceview.cpp | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 8763b4db578..4b04eb4b23e 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -140,9 +140,9 @@ NodeInstanceView::~NodeInstanceView()
\param model Model to which the view is attached
*/
-bool isSkippedNode(const ModelNode &node)
+bool isSkippedRootNode(const ModelNode &node)
{
- static QStringList skipList = QStringList() << "Qt.ListModel" << "QtQuick.ListModel";
+ static QStringList skipList = QStringList() << "Qt.ListModel" << "QtQuick.ListModel" << "Qt.ListModel" << "QtQuick.ListModel";
if (skipList.contains(node.type()))
return true;
@@ -150,6 +150,12 @@ bool isSkippedNode(const ModelNode &node)
return false;
}
+
+bool isSkippedNode(const ModelNode &)
+{
+ return false;
+}
+
void NodeInstanceView::modelAttached(Model *model)
{
AbstractView::modelAttached(model);
@@ -157,7 +163,7 @@ void NodeInstanceView::modelAttached(Model *model)
m_lastCrashTime.start();
connect(m_nodeInstanceServer.data(), SIGNAL(processCrashed()), this, SLOT(handleChrash()));
- if (!isSkippedNode(rootModelNode()))
+ if (!isSkippedRootNode(rootModelNode()))
nodeInstanceServer()->createScene(createCreateSceneCommand());
}
@@ -195,7 +201,7 @@ void NodeInstanceView::restartProcess()
m_nodeInstanceServer = new NodeInstanceServerProxy(this, m_runModus);
connect(m_nodeInstanceServer.data(), SIGNAL(processCrashed()), this, SLOT(handleChrash()));
- if (!isSkippedNode(rootModelNode()))
+ if (!isSkippedRootNode(rootModelNode()))
nodeInstanceServer()->createScene(createCreateSceneCommand());
}
}
--
GitLab