Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/imports/controls/BusyIndicator.qml
	src/imports/controls/CheckBox.qml
	src/imports/controls/CheckDelegate.qml
	src/imports/controls/ComboBox.qml
	src/imports/controls/DelayButton.qml
	src/imports/controls/Dial.qml
	src/imports/controls/ItemDelegate.qml
	src/imports/controls/MenuItem.qml
	src/imports/controls/RadioButton.qml
	src/imports/controls/RadioDelegate.qml
	src/imports/controls/SwipeDelegate.qml
	src/imports/controls/Switch.qml
	src/imports/controls/SwitchDelegate.qml
	src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
	src/imports/controls/material/CheckDelegate.qml
	src/imports/controls/material/ItemDelegate.qml
	src/imports/controls/material/MenuItem.qml
	src/imports/controls/material/RadioDelegate.qml
	src/imports/controls/material/SwipeDelegate.qml
	src/imports/controls/material/SwitchDelegate.qml
	src/imports/controls/qquickdefaultbusyindicator.cpp
	src/imports/controls/qquickdefaultbusyindicator_p.h
	src/imports/controls/qtquickcontrols2plugin.cpp
	src/imports/controls/universal/CheckDelegate.qml
	src/imports/controls/universal/ItemDelegate.qml
	src/imports/controls/universal/MenuItem.qml
	src/imports/controls/universal/RadioDelegate.qml
	src/imports/controls/universal/SwipeDelegate.qml
	src/imports/controls/universal/SwitchDelegate.qml
	src/quickcontrols2/quickcontrols2.pri
	src/quicktemplates2/qquickcontrol.cpp
	src/quicktemplates2/qquickmenu.cpp
	src/quicktemplates2/qquickpopup_p.h

Change-Id: Ib25c8b4a7fe018b7c0ade9b02bfaaa6980118c15

1 files changed, 21 insertions, 41 deletions

diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml
index 461f4195..e6a1a2d9 100644
--- a/src/imports/controls/DelayButton.qml
+++ b/src/imports/controls/DelayButton.qml
@@ -58,55 +58,35 @@ T.DelayButton {
         }
     }
 
-    contentItem: Item {
-        implicitWidth: label.implicitWidth
-        implicitHeight: label.implicitHeight
-
-        Item {
-            x: -control.leftPadding + (control.progress * control.width)
-            width: (1.0 - control.progress) * control.width
-            height: parent.height
-
+    contentItem: ItemGroup {
+        ClippedText {
             clip: control.progress > 0
+            clipX: -control.leftPadding + control.progress * control.width
+            clipWidth: (1.0 - control.progress) * control.width
             visible: control.progress < 1
 
-            Text {
-                id: label
-                x: -parent.x
-                width: control.availableWidth
-                height: parent.height
-
-                text: control.text
-                font: control.font
-                opacity: enabled ? 1 : 0.3
-                color: control.palette.buttonText
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                elide: Text.ElideRight
-            }
+            text: control.text
+            font: control.font
+            opacity: enabled ? 1 : 0.3
+            color: control.palette.buttonText
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
         }
 
-        Item {
-            x: -control.leftPadding
-            width: control.progress * control.width
-            height: parent.height
-
+        ClippedText {
             clip: control.progress > 0
+            clipX: -control.leftPadding
+            clipWidth: control.progress * control.width
             visible: control.progress > 0
 
-            Text {
-                x: control.leftPadding
-                width: control.availableWidth
-                height: parent.height
-
-                text: control.text
-                font: control.font
-                opacity: enabled ? 1 : 0.3
-                color: control.palette.brightText
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                elide: Text.ElideRight
-            }
+            text: control.text
+            font: control.font
+            opacity: enabled ? 1 : 0.3
+            color: control.palette.brightText
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
         }
     }