Make tst_customization easier to maintain

Maintain the tested controls and delegates in a single array that can
be re-used for testing all styles without repetitive and error-prone
hand-written data rows.

For this to work, the structure of the tested styles must match. The
"incomplete" and "override" styles filled in all possible delegates,
whereas the "simple" style filled in only the normally used delegates.
The test styles have now been synced with the structure of our built-
in styles. For example, Dials and Sliders don't normally have a content
item, and CheckBoxes and RadioButtons don't normally have a background.

Change-Id: I48a26ee170f66882c55b54a282f2e4b3a3875f9a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

7 files changed, 0 insertions, 28 deletions

diff --git a/tests/auto/customization/data/styles/override/CheckBox.qml b/tests/auto/customization/data/styles/override/CheckBox.qml
index 538cbdb1..dfaba8a4 100644
--- a/tests/auto/customization/data/styles/override/CheckBox.qml
+++ b/tests/auto/customization/data/styles/override/CheckBox.qml
@@ -62,8 +62,4 @@ Simple.CheckBox {
     contentItem: Item {
         objectName: "checkbox-contentItem-override"
     }
-
-    background: Item {
-        objectName: "checkbox-background-override"
-    }
 }
diff --git a/tests/auto/customization/data/styles/override/Dial.qml b/tests/auto/customization/data/styles/override/Dial.qml
index f843a4ca..4b84a30a 100644
--- a/tests/auto/customization/data/styles/override/Dial.qml
+++ b/tests/auto/customization/data/styles/override/Dial.qml
@@ -59,10 +59,6 @@ Simple.Dial {
         objectName: "dial-handle-override"
     }
 
-    contentItem: Item {
-        objectName: "dial-contentItem-override"
-    }
-
     background: Item {
         objectName: "dial-background-override"
     }
diff --git a/tests/auto/customization/data/styles/override/RadioButton.qml b/tests/auto/customization/data/styles/override/RadioButton.qml
index 0ecec7e3..42397f08 100644
--- a/tests/auto/customization/data/styles/override/RadioButton.qml
+++ b/tests/auto/customization/data/styles/override/RadioButton.qml
@@ -62,8 +62,4 @@ Simple.RadioButton {
     contentItem: Item {
         objectName: "radiobutton-contentItem-override"
     }
-
-    background: Item {
-        objectName: "radiobutton-background-override"
-    }
 }
diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/customization/data/styles/override/RangeSlider.qml
index b10ff8a2..575926e5 100644
--- a/tests/auto/customization/data/styles/override/RangeSlider.qml
+++ b/tests/auto/customization/data/styles/override/RangeSlider.qml
@@ -63,10 +63,6 @@ Simple.RangeSlider {
         objectName: "rangeslider-second.handle-override"
     }
 
-    contentItem: Item {
-        objectName: "rangeslider-contentItem-override"
-    }
-
     background: Item {
         objectName: "rangeslider-background-override"
     }
diff --git a/tests/auto/customization/data/styles/override/ScrollView.qml b/tests/auto/customization/data/styles/override/ScrollView.qml
index 0c8bd774..040c9815 100644
--- a/tests/auto/customization/data/styles/override/ScrollView.qml
+++ b/tests/auto/customization/data/styles/override/ScrollView.qml
@@ -55,10 +55,6 @@ Simple.ScrollView {
     id: control
     objectName: "scrollview-override"
 
-    contentItem: Flickable {
-        objectName: "scrollview-contentItem-override"
-    }
-
     background: Item {
         objectName: "scrollview-background-override"
     }
diff --git a/tests/auto/customization/data/styles/override/Slider.qml b/tests/auto/customization/data/styles/override/Slider.qml
index dc4fb8d7..0ca6f6c4 100644
--- a/tests/auto/customization/data/styles/override/Slider.qml
+++ b/tests/auto/customization/data/styles/override/Slider.qml
@@ -59,10 +59,6 @@ Simple.Slider {
         objectName: "slider-handle-override"
     }
 
-    contentItem: Item {
-        objectName: "slider-contentItem-override"
-    }
-
     background: Item {
         objectName: "slider-background-override"
     }
diff --git a/tests/auto/customization/data/styles/override/Switch.qml b/tests/auto/customization/data/styles/override/Switch.qml
index 60e7c829..4ab8ffe7 100644
--- a/tests/auto/customization/data/styles/override/Switch.qml
+++ b/tests/auto/customization/data/styles/override/Switch.qml
@@ -62,8 +62,4 @@ Simple.Switch {
     contentItem: Item {
         objectName: "switch-contentItem-override"
     }
-
-    background: Item {
-        objectName: "switch-background-override"
-    }
 }