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, 2 insertions, 61 deletions

diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml
index 05834fdf..15e23df9 100644
--- a/src/imports/controls/designer/ButtonSection.qml
+++ b/src/imports/controls/designer/ButtonSection.qml
@@ -40,22 +40,12 @@ import QtQuick.Layouts 1.0
 
 Section {
     id: section
+    caption: qsTr("Button")
 
     SectionLayout {
         Label {
-            text: qsTr("Text")
-            tooltip: qsTr("The text displayed on the %1.").arg(section.caption.toLowerCase())
-        }
-        SecondColumnLayout {
-            LineEdit {
-                backendValue: backendValues.text
-                Layout.fillWidth: true
-            }
-        }
-
-        Label {
             text: qsTr("Highlighted")
-            tooltip: qsTr("Whether the %1 is highlighted.").arg(section.caption.toLowerCase())
+            tooltip: qsTr("Whether the button is highlighted.")
         }
         SecondColumnLayout {
             CheckBox {
@@ -64,54 +54,5 @@ Section {
                 Layout.fillWidth: true
             }
         }
-
-        Label {
-            visible: checkable
-            text: qsTr("Checkable")
-            tooltip: qsTr("Whether the %1 is checkable.").arg(section.caption.toLowerCase())
-        }
-        SecondColumnLayout {
-            CheckBox {
-                text: backendValues.checkable.valueToString
-                backendValue: backendValues.checkable
-                Layout.fillWidth: true
-            }
-        }
-
-        Label {
-            text: qsTr("Checked")
-            tooltip: qsTr("Whether the %1 is checked.").arg(section.caption.toLowerCase())
-        }
-        SecondColumnLayout {
-            CheckBox {
-                text: backendValues.checked.valueToString
-                backendValue: backendValues.checked
-                Layout.fillWidth: true
-            }
-        }
-
-        Label {
-            text: qsTr("Exclusive")
-            tooltip: qsTr("Whether the %1 is exclusive.").arg(section.caption.toLowerCase())
-        }
-        SecondColumnLayout {
-            CheckBox {
-                text: backendValues.autoExclusive.valueToString
-                backendValue: backendValues.autoExclusive
-                Layout.fillWidth: true
-            }
-        }
-
-        Label {
-            text: qsTr("Repeat")
-            tooltip: qsTr("Whether the %1 repeats while pressed and held down.").arg(section.caption.toLowerCase())
-        }
-        SecondColumnLayout {
-            CheckBox {
-                text: backendValues.autoRepeat.valueToString
-                backendValue: backendValues.autoRepeat
-                Layout.fillWidth: true
-            }
-        }
     }
 }