From 00c8e7601060bd97f68afa323b738cb5288d805b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 4 Aug 2010 13:53:59 +0200
Subject: [PATCH] QmlDesigner.core: changes QASSERT into condition
The "data" property actually might be a binding. At least
the QmlEngine accepts this case. We do nit resolve such
bindings at the moment, but we do not assert anymore.
Reviewed-by: Marco Bubke
---
.../designercore/model/qmlitemnode.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 746d3ffa916..2229162c9f5 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -90,13 +90,13 @@ QList<QmlItemNode> QmlItemNode::children() const
QList<ModelNode> modelNodeList;
if (modelNode().hasProperty("children")) {
- Q_ASSERT(modelNode().property("children").isNodeListProperty());
- modelNodeList.append(modelNode().nodeListProperty("children").toModelNodeList());
+ if (modelNode().property("children").isNodeListProperty())
+ modelNodeList.append(modelNode().nodeListProperty("children").toModelNodeList());
}
if (modelNode().hasProperty("data")) {
- Q_ASSERT(modelNode().property("data").isNodeListProperty());
- modelNodeList.append(modelNode().nodeListProperty("data").toModelNodeList());
+ if (modelNode().property("data").isNodeListProperty())
+ modelNodeList.append(modelNode().nodeListProperty("data").toModelNodeList());
}
foreach (const ModelNode &modelNode, modelNodeList) {
@@ -114,13 +114,13 @@ QList<QmlObjectNode> QmlItemNode::resources() const
if (isValid()) {
QList<ModelNode> modelNodeList;
if (modelNode().hasProperty("resources")) {
- Q_ASSERT(modelNode().property("resources").isNodeListProperty());
- modelNodeList.append(modelNode().nodeListProperty("resources").toModelNodeList());
+ if (modelNode().property("resources").isNodeListProperty())
+ modelNodeList.append(modelNode().nodeListProperty("resources").toModelNodeList());
}
if (modelNode().hasProperty("data")) {
- Q_ASSERT(modelNode().property("data").isNodeListProperty());
- modelNodeList.append(modelNode().nodeListProperty("data").toModelNodeList());
+ if (modelNode().property("data").isNodeListProperty())
+ modelNodeList.append(modelNode().nodeListProperty("data").toModelNodeList());
}
foreach (const ModelNode &node, modelNodeList) {
--
GitLab