From 40f86f405833aa991d0ea1e77f2045b48c3e4468 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Thu, 25 Nov 2010 13:05:34 +0100
Subject: [PATCH] QmlDesigner.NodeInstances: Check if object is null
---
.../qmldesigner/designercore/instances/objectnodeinstance.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
index dd733efb7e8..20c76793549 100644
--- a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
@@ -565,7 +565,7 @@ QStringList allPropertyNames(QObject *object, const QString &baseName = QString(
QStringList propertyNameList;
- if (inspectedObjects->contains(object))
+ if (inspectedObjects== 0 || inspectedObjects->contains(object))
return propertyNameList;
inspectedObjects->append(object);
@@ -835,7 +835,7 @@ QStringList propertyNameForWritableProperties(QObject *object, const QString &ba
{
QStringList propertyNameList;
- if (inspectedObjects->contains(object))
+ if (inspectedObjects == 0 || inspectedObjects->contains(object))
return propertyNameList;
inspectedObjects->append(object);
--
GitLab