Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/imports/controls/qtquickcontrols2plugin.cpp

Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27

27 files changed, 0 insertions, 54 deletions

diff --git a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
index 504993f2..b0aa6284 100644
--- a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "busyindicator"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/ButtonPage.qml b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
index dce39203..c77b41e4 100644
--- a/examples/quickcontrols2/gallery/pages/ButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
@@ -55,8 +55,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "button"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
index ac1ed4b7..7795f814 100644
--- a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "checkbox"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
index b194da7f..ec75607c 100644
--- a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "combobox"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
index ea73e6a7..91110567 100644
--- a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    property string control : "delaybutton"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
index 4c3f0333..30f07be1 100644
--- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
@@ -55,8 +55,6 @@ import QtQuick.Controls 2.12
 Pane {
     padding: 0
 
-    property string control : "swipedelegate"
-
     property var delegateComponentMap: {
         "ItemDelegate": itemDelegateComponent,
         "SwipeDelegate": swipeDelegateComponent,
diff --git a/examples/quickcontrols2/gallery/pages/DialPage.qml b/examples/quickcontrols2/gallery/pages/DialPage.qml
index 8372d56f..3bb3bb28 100644
--- a/examples/quickcontrols2/gallery/pages/DialPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DialPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "dial"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/DialogPage.qml b/examples/quickcontrols2/gallery/pages/DialogPage.qml
index 167fa186..9d23e260 100644
--- a/examples/quickcontrols2/gallery/pages/DialogPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DialogPage.qml
@@ -55,8 +55,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "dialog"
-
     readonly property int buttonWidth: Math.max(button.implicitWidth, Math.min(button.implicitWidth * 2, page.availableWidth / 3))
 
     Column {
diff --git a/examples/quickcontrols2/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml
index 5d4b2f7b..4834d04d 100644
--- a/examples/quickcontrols2/gallery/pages/FramePage.qml
+++ b/examples/quickcontrols2/gallery/pages/FramePage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "frame"
-
     readonly property int itemWidth: Math.max(button.implicitWidth, Math.min(button.implicitWidth * 3, page.availableWidth / 3 * 2))
 
     Column {
diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
index 41f115a7..16f8762a 100644
--- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "groupbox"
-
     readonly property int itemWidth: Math.max(button.implicitWidth, Math.min(button.implicitWidth * 3, page.availableWidth / 3 * 2))
 
     Column {
diff --git a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
index dd0d3e9c..4f13ce33 100644
--- a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "pageindicator"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
index 89b951ee..1f3c81b9 100644
--- a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "progressbar"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
index 9685426e..b573731e 100644
--- a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "radiobutton"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
index d04e7cb4..b6c35766 100644
--- a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "rangeslider"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
index 8ebf65ac..d9e77fa4 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 Flickable {
     id: flickable
 
-    readonly property string control : "scrollbar"
-
     contentHeight: pane.height
 
     Pane {
diff --git a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
index 4aa641a8..2adcbc6b 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 Flickable {
     id: flickable
 
-    readonly property string control : "scrollindicator"
-
     contentHeight: pane.height
 
     Pane {
diff --git a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
index 2d525cf6..afb5ef5c 100644
--- a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 Page {
     id: page
 
-    readonly property string control : "flickable"
-
     default property alias content: pane.contentItem
 
     Flickable {
diff --git a/examples/quickcontrols2/gallery/pages/SliderPage.qml b/examples/quickcontrols2/gallery/pages/SliderPage.qml
index 9a2f3baf..93a1ebb1 100644
--- a/examples/quickcontrols2/gallery/pages/SliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SliderPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "slider"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
index 7ad62caa..9e458331 100644
--- a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : ""
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/StackViewPage.qml b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
index d52cf85a..43ee5684 100644
--- a/examples/quickcontrols2/gallery/pages/StackViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
@@ -55,8 +55,6 @@ StackView {
     id: stackView
     initialItem: page
 
-    readonly property string control : "stackview"
-
     Component {
         id: page
 
diff --git a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
index c55250e4..3c3bc56c 100644
--- a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 Pane {
     id: pane
 
-    readonly property string control : "swipeview"
-
     SwipeView {
         id: view
         currentIndex: 1
diff --git a/examples/quickcontrols2/gallery/pages/SwitchPage.qml b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
index 9e3f03f8..53ee1660 100644
--- a/examples/quickcontrols2/gallery/pages/SwitchPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "switch"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/TabBarPage.qml b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
index 1bfda1c1..7c3cae44 100644
--- a/examples/quickcontrols2/gallery/pages/TabBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 Page {
     id: page
 
-    readonly property string control : "tabbar"
-
     SwipeView {
         id: swipeView
         anchors.fill: parent
diff --git a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
index 4a6d25e7..7ed2b58b 100644
--- a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "textarea"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
index 527f7a64..37a5d605 100644
--- a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "textfield"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
index fea05551..295ea2c4 100644
--- a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "tooltip"
-
     Column {
         spacing: 40
         width: parent.width
diff --git a/examples/quickcontrols2/gallery/pages/TumblerPage.qml b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
index a7c95d21..af4caee3 100644
--- a/examples/quickcontrols2/gallery/pages/TumblerPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
@@ -54,8 +54,6 @@ import QtQuick.Controls 2.12
 ScrollablePage {
     id: page
 
-    readonly property string control : "tumbler"
-
     Column {
         spacing: 40
         width: parent.width