feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.PropertyEditor: crash fix

Browse Source 
This crashed when the template definitions were missing.

Change-Id: I22aff1b9bb809ff59f108cb90f47b19c2db223fa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-08-12 17:08:39 +02:00
parent 8ffdcc60a6
commit bba547d1f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -54,7 +54,7 @@ enum {
const char resourcePropertyEditorPath[] = ":/propertyeditor"; const char resourcePropertyEditorPath[] = ":/propertyeditor";
static QmlJS::SimpleReaderNode::Ptr s_templateConfiguration; static QmlJS::SimpleReaderNode::Ptr s_templateConfiguration = QmlJS::SimpleReaderNode::Ptr();
static inline QString propertyTemplatesPath() static inline QString propertyTemplatesPath()
{ {
@@ -345,7 +345,7 @@ QString PropertyEditorQmlBackend::templateGeneration(NodeMetaInfo type,
NodeMetaInfo superType, NodeMetaInfo superType,
const QmlObjectNode &objectNode) const QmlObjectNode &objectNode)
{ {
if (!templateConfiguration() && templateConfiguration()->isValid()) if (!templateConfiguration() || !templateConfiguration()->isValid())
return QString(); return QString();
QStringList imports = variantToStringList(templateConfiguration()->property(QLatin1String("imports"))); QStringList imports = variantToStringList(templateConfiguration()->property(QLatin1String("imports")));