summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Uwe Broulik <kde@privat.broulik.de>2015-02-15 16:31:28 +0100
committerKai Uwe Broulik <kde@privat.broulik.de>2015-02-16 14:27:30 +0000
commit963479d559997d64633fdd5ceac595228c2509ae (patch)
tree5f4543f01b16d0a160955b928512b577895f2a13
parent9af9dabe3c88baa87befe5a4591d7f3508888307 (diff)
downloadqtquickcontrols-963479d559997d64633fdd5ceac595228c2509ae.tar.gz
ComboBox: Fix opening popup when pressing space when editable
Task-number: QTBUG-38612 Change-Id: I595c0b18f4cb88dc2948f869201cb944afc06740 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/ComboBox.qml5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 5ec0e1f8..4dc8ca39 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -653,7 +653,10 @@ Control {
// The key bindings below will only be in use when popup is
// not visible. Otherwise, native popup key handling will take place:
Keys.onSpacePressed: {
- popup.toggleShow()
+ if (!editable)
+ popup.toggleShow()
+ else
+ event.accepted = false
}
Keys.onUpPressed: __selectPrevItem()