summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/controls/Calendar.qml2
-rw-r--r--src/controls/ComboBox.qml5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index 1ce6e2c2..ba40893a 100644
--- a/src/controls/Calendar.qml
+++ b/src/controls/Calendar.qml
@@ -66,7 +66,7 @@ import QtQuick.Controls.Private 1.0
\c true.
\qml
- Calendar{
+ Calendar {
weekNumbersVisible: true
}
\endqml
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()