From f379d3782f36ffa106272fe319bc2fee1e744688 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 7 Sep 2010 14:29:52 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: add sanity check
---
.../propertyeditor/propertyeditorvalue.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 59bfd5db13c..bad02129c2d 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -333,12 +333,13 @@ void PropertyEditorNodeWrapper::setup()
delete object;
foreach (const QString &propertyName, m_modelNode.metaInfo().properties().keys()) {
- PropertyEditorValue *valueObject = new PropertyEditorValue(&m_valuesPropertyMap);
- valueObject->setName(propertyName);
- valueObject->setValue(fxObjectNode.instanceValue(propertyName));
-
- connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_valuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&)));
- m_valuesPropertyMap.insert(propertyName, QVariant::fromValue(valueObject));
+ if (fxObjectNode.isValid()) {
+ PropertyEditorValue *valueObject = new PropertyEditorValue(&m_valuesPropertyMap);
+ valueObject->setName(propertyName);
+ valueObject->setValue(fxObjectNode.instanceValue(propertyName));
+ connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_valuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&)));
+ m_valuesPropertyMap.insert(propertyName, QVariant::fromValue(valueObject));
+ }
}
}
connect(&m_valuesPropertyMap, SIGNAL(valueChanged(const QString &, const QVariant&)), this, SLOT(changeValue(const QString&)));
--
GitLab