From 9b45d0e2ebb126aae9fd4a302c896ab7d7d41f2e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 18 Apr 2013 09:53:49 +0200 Subject: [PATCH] QmlDesigner: treat window as item For simplicity we just pretend Window is an item. The state editing is broken atm but does not crash. We will fix this later. Change-Id: I5da0c624b467448cccf16a88fa3ad3682f4ccc20 Reviewed-by: Marco Bubke --- .../designercore/model/qmlitemnode.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 75dffde67f3..697ee77ac85 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -42,10 +42,24 @@ namespace QmlDesigner { +namespace { + +bool isItemOrWindow(const ModelNode &modelNode) +{ + if (modelNode.metaInfo().isSubclassOf("QtQuick.Item", -1, -1)) + return true; + + if (modelNode.metaInfo().isSubclassOf("QtQuick.Window.Window", -1, -1) && modelNode.isRootNode()) + return true; + + return false; +} + +} bool QmlItemNode::isValid() const { - return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().isSubclassOf("QtQuick.Item", -1, -1); + return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && isItemOrWindow(modelNode()); } bool QmlItemNode::isRootNode() const