Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0

Change-Id: Iacaf1656f2a66df0a97641f855aaf4d9d9189e6d

1 files changed, 37 insertions, 0 deletions

diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml
index 7ecb5760..90dd3816 100644
--- a/src/imports/controls/designer/ControlSection.qml
+++ b/src/imports/controls/designer/ControlSection.qml
@@ -55,6 +55,31 @@ Section {
         }
 
         Label {
+            text: qsTr("Focus Policy")
+            tooltip: qsTr("Focus policy of the control.")
+        }
+        SecondColumnLayout {
+            ComboBox {
+                backendValue: backendValues.focusPolicy
+                model: [ "TabFocus", "ClickFocus", "StrongFocus", "WheelFocus", "NoFocus" ]
+                scope: "Qt"
+                Layout.fillWidth: true
+            }
+        }
+
+        Label {
+            text: qsTr("Hover")
+            tooltip: qsTr("Whether control accepts hover evets.")
+        }
+        SecondColumnLayout {
+            CheckBox {
+                text: backendValues.hoverEnabled.valueToString
+                backendValue: backendValues.hoverEnabled
+                Layout.fillWidth: true
+            }
+        }
+
+        Label {
             text: qsTr("Spacing")
             tooltip: qsTr("Spacing between internal elements of the control.")
         }
@@ -67,5 +92,17 @@ Section {
                 Layout.fillWidth: true
             }
         }
+
+        Label {
+            text: qsTr("Wheel")
+            tooltip: qsTr("Whether control accepts wheel evets.")
+        }
+        SecondColumnLayout {
+            CheckBox {
+                text: backendValues.wheelEnabled.valueToString
+                backendValue: backendValues.wheelEnabled
+                Layout.fillWidth: true
+            }
+        }
     }
 }