diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:38:46 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:38:47 +0100 |
| commit | c614d78e2246d3f66782471250ccb1eece5ffbd8 (patch) | |
| tree | d8380aa2ba2dccb079fa103c30c65c94848fe821 /src/controls/ComboBox.qml | |
| parent | 20bd6bd5fa7555b0574c244ead70c4750c378593 (diff) | |
| parent | e10dcd4c98631d1d433073b43101b8c36be05520 (diff) | |
| download | qtquickcontrols-c614d78e2246d3f66782471250ccb1eece5ffbd8.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I00fb1d7ed1351fb15d714a51a3d54154ee01bb1d
Diffstat (limited to 'src/controls/ComboBox.qml')
| -rw-r--r-- | src/controls/ComboBox.qml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 2f50dc0e..f0067822 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -649,7 +649,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() |