summaryrefslogtreecommitdiff
path: root/src/controls/ComboBox.qml
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-04-10 16:46:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-28 13:34:24 +0200
commit7b5c79df9b5e6eea40bee48f188771fd19198893 (patch)
treedabb718c2365f0447235be82885297049b681217 /src/controls/ComboBox.qml
parent38be2edc660e137ae549eb91d27cf1d14234149e (diff)
downloadqtquickcontrols-7b5c79df9b5e6eea40bee48f188771fd19198893.tar.gz
ComboBox: Update currentText when currentIndex goes from -1 to 0
We need to help things a bit because the internal selectedText property won't change in that specific case. Task-number: QTBUG-38036 Change-Id: Id997da97a77faad8ffaad08e8b9c7614d8b6b7fc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/controls/ComboBox.qml')
-rw-r--r--src/controls/ComboBox.qml2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index c130abe8..16489118 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -586,6 +586,8 @@ Control {
if (__selectedIndex !== -1 && (selectedItem = items[__selectedIndex])) {
input.editTextMatches = true
selectedText = selectedItem.text
+ if (currentText !== selectedText) // __selectedIndex went form -1 to 0
+ selectedTextChanged()
}
}
}