summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-28 10:59:52 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-09-08 12:17:24 +0200
commitb66155cf179dcdbf86c6379d6c9eed1446b47fa3 (patch)
treedf293ce31ad3fdf5cf22f8a9085c608ab6f45a22
parent521052be8673b6f986e630f7b8c627682009bd6f (diff)
downloadqt-creator-b66155cf179dcdbf86c6379d6c9eed1446b47fa3.tar.gz
QmlDesigner.PropertyEditor: Change default editor for color
This template breaks the layout and is currently unusable. Therefore we replace it by a string editor. Change-Id: I0818d006a4516f34954d5406ee4074664e909891 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml
index a4a404bedf..4a0d740df0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml
@@ -22,8 +22,9 @@ AutoTypes {
typeNames: ["bool", "boolean"]
sourceFile: "BooleanEditorTemplate.template"
}
+
Type {
typeNames: ["color", "QColor"]
- sourceFile: "ColorEditorTemplate.template"
+ sourceFile: "StringEditorTemplate.template"
}
}