diff options
author | Henning Gruendl <henning.gruendl@qt.io> | 2019-08-16 10:55:14 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-08-16 11:33:53 +0000 |
commit | 8f9fa82880664be11fea7945042087be49bd708f (patch) | |
tree | 5ab46fed8d0bb4ac1fd46816ca2111e527f2f344 | |
parent | 79576601dbd7d5cc288216111592091d790085b6 (diff) | |
download | qt-creator-8f9fa82880664be11fea7945042087be49bd708f.tar.gz |
QmlDesigner: Fix HelperWidgets ComboBox
Task-number: QDS-926
Change-Id: I77eafbf8c66b8a384dc8786726c74c89acad58ad
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml index 62a285a52b..74414cb592 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml @@ -62,9 +62,7 @@ StudioControls.ComboBox { ColorLogic { id: colorLogic backendValue: comboBox.backendValue - onValueFromBackendChanged: { - invalidate(); - } + onValueFromBackendChanged: invalidate() function invalidate() { @@ -74,9 +72,9 @@ StudioControls.ComboBox { block = true if (manualMapping) { - valueFromBackendChanged(); + comboBox.valueFromBackendChanged() } else if (!comboBox.useInteger) { - var enumString = comboBox.backendValue.enumeration; + var enumString = comboBox.backendValue.enumeration if (enumString === "") enumString = comboBox.backendValue.value @@ -100,24 +98,23 @@ StudioControls.ComboBox { onActivated: { if (!__isCompleted) - return; + return if (backendValue === undefined) - return; + return if (manualMapping) - return; + return if (!comboBox.useInteger) { - backendValue.setEnumeration(comboBox.scope, comboBox.currentText); + backendValue.setEnumeration(comboBox.scope, comboBox.currentText) } else { - backendValue.value = comboBox.currentIndex; + backendValue.value = comboBox.currentIndex } } Component.onCompleted: { colorLogic.invalidate() - __isCompleted = true; + __isCompleted = true } - } |