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

QmlDesigner.propertyEditor: fix crash

Browse Source 
"#000000" and "true" is not really an expression and is handled as
value now - this keeps consistency with rewriting and the QmlDom
This commit is contained in:
Thomas Hartmann
2010-03-02 17:49:58 +01:00
parent 46b0848b8d
commit a0faeb73f1
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -387,6 +387,22 @@ void PropertyEditor::changeExpression(const QString &name)
QmlObjectNode fxObjectNode(m_selectedNode); QmlObjectNode fxObjectNode(m_selectedNode);
PropertyEditorValue *value = qobject_cast<PropertyEditorValue*>(QDeclarativeMetaType::toQObject(m_currentType->m_backendValuesPropertyMap.value(underscoreName))); PropertyEditorValue *value = qobject_cast<PropertyEditorValue*>(QDeclarativeMetaType::toQObject(m_currentType->m_backendValuesPropertyMap.value(underscoreName)));
if (fxObjectNode.modelNode().metaInfo().isValid() && fxObjectNode.modelNode().metaInfo().property(name).isValid())
if (fxObjectNode.modelNode().metaInfo().property(name).type() == QLatin1String("QColor")) {
if (QColor(value->expression().remove('"')).isValid()) {
fxObjectNode.setVariantProperty(name, QColor(value->expression().remove('"')));
return;
}
} else if (fxObjectNode.modelNode().metaInfo().property(name).type() == QLatin1String("bool")) {
if (value->expression().compare("false", Qt::CaseInsensitive) == 0 || value->expression().compare("true", Qt::CaseInsensitive) == 0) {
if (value->expression().compare("true", Qt::CaseInsensitive) == 0)
fxObjectNode.setVariantProperty(name, true);
else
fxObjectNode.setVariantProperty(name, false);
return;
}
}
if (!value) { if (!value) {
qWarning() << "PropertyEditor::changeExpression no value for " << underscoreName; qWarning() << "PropertyEditor::changeExpression no value for " << underscoreName;
return; return;