diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-11-21 14:02:27 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-11-21 15:19:00 +0100 |
| commit | 74d0ba65e11e7a5ac9df361e718debf8927ab917 (patch) | |
| tree | c52c07977d7917052f83e61e70637ebaf6405ea6 /src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h | |
| parent | 8cbf0e7045505eb960ae3f16b67cf2fb84e84a81 (diff) | |
| download | qt-creator-74d0ba65e11e7a5ac9df361e718debf8927ab917.tar.gz | |
QmlDesigner.propertyEditor: fixing color editing in Qt5
In Qt5 color does not implcitly get converted to string in QML.
Since this was never a documented feature we just adapt the
codein the property editor and convert color to string explictly if
needed.
Change-Id: I6b2b1dc356d2ec1c806c77450f49e793def2f5bb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h')
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h index b55a2a529f..1bb01459bd 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h @@ -65,6 +65,8 @@ public: QDeclarativePropertyMap* backendValues() const { return m_backendValues; } + Q_INVOKABLE QString convertColorToString(const QColor &color) { return color.name(); } + signals: void globalBaseUrlChanged(); void specificsUrlChanged(); |