Cleanup and speedup tst_accessibility

Before:
    Totals: 37 passed, 0 failed, 0 skipped, 0 blacklisted, 6919ms

After:
    Totals: 37 passed, 0 failed, 0 skipped, 0 blacklisted, 599ms

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

40 files changed, 86 insertions, 388 deletions

diff --git a/tests/auto/accessibility/data/busyindicator.qml b/tests/auto/accessibility/data/busyindicator.qml
index 4bde9634..b15ea80a 100644
--- a/tests/auto/accessibility/data/busyindicator.qml
+++ b/tests/auto/accessibility/data/busyindicator.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    BusyIndicator {
-        id: busyindicator
-        objectName: "busyindicator"
-    }
-}
+BusyIndicator { }
diff --git a/tests/auto/accessibility/data/button.qml b/tests/auto/accessibility/data/button.qml
index 75925185..0fd14210 100644
--- a/tests/auto/accessibility/data/button.qml
+++ b/tests/auto/accessibility/data/button.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Button {
-        id: button
-        objectName: "button"
-        text: "Button"
-    }
+Button {
+    text: "Button"
 }
diff --git a/tests/auto/accessibility/data/checkbox.qml b/tests/auto/accessibility/data/checkbox.qml
index 9700663d..e70d7d83 100644
--- a/tests/auto/accessibility/data/checkbox.qml
+++ b/tests/auto/accessibility/data/checkbox.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    CheckBox {
-        id: checkbox
-        objectName: "checkbox"
-        text: "CheckBox"
-    }
+CheckBox {
+    text: "CheckBox"
 }
diff --git a/tests/auto/accessibility/data/checkdelegate.qml b/tests/auto/accessibility/data/checkdelegate.qml
index d7f786da..0a1a4a4f 100644
--- a/tests/auto/accessibility/data/checkdelegate.qml
+++ b/tests/auto/accessibility/data/checkdelegate.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    CheckDelegate {
-        id: checkdelegate
-        objectName: "checkdelegate"
-        text: "CheckDelegate"
-    }
+CheckDelegate {
+    text: "CheckDelegate"
 }
diff --git a/tests/auto/accessibility/data/combobox.qml b/tests/auto/accessibility/data/combobox.qml
index 3bf972e9..42e4d47b 100644
--- a/tests/auto/accessibility/data/combobox.qml
+++ b/tests/auto/accessibility/data/combobox.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ComboBox {
-        id: button
-        objectName: "combobox"
-        model: ["ComboBox"]
-    }
+ComboBox {
+    model: ["ComboBox"]
 }
diff --git a/tests/auto/accessibility/data/control.qml b/tests/auto/accessibility/data/control.qml
index ceaba509..4831a6c6 100644
--- a/tests/auto/accessibility/data/control.qml
+++ b/tests/auto/accessibility/data/control.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Control {
-        id: control
-        objectName: "control"
-    }
-}
+Control { }
diff --git a/tests/auto/accessibility/data/dayofweekrow-2.qml b/tests/auto/accessibility/data/dayofweekrow-2.qml
index 26569836..265f975a 100644
--- a/tests/auto/accessibility/data/dayofweekrow-2.qml
+++ b/tests/auto/accessibility/data/dayofweekrow-2.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import Qt.labs.calendar 1.0
 
-Window {
-    visible: true
-
-    DayOfWeekRow {
-        id: dayofweekrow
-        objectName: "dayofweekrow"
-    }
-}
+DayOfWeekRow { }
diff --git a/tests/auto/accessibility/data/dayofweekrow.qml b/tests/auto/accessibility/data/dayofweekrow.qml
index c799aba1..a3ab92dd 100644
--- a/tests/auto/accessibility/data/dayofweekrow.qml
+++ b/tests/auto/accessibility/data/dayofweekrow.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import Qt.labs.calendar 1.0
 
-Window {
-    visible: true
-
-    DayOfWeekRow {
-        id: dayofweekrow
-        objectName: "dayofweekrow"
-        Accessible.name: "DayOfWeekRow"
-    }
+DayOfWeekRow {
+    Accessible.name: "DayOfWeekRow"
 }
diff --git a/tests/auto/accessibility/data/dial.qml b/tests/auto/accessibility/data/dial.qml
index 6b2333b1..39b85550 100644
--- a/tests/auto/accessibility/data/dial.qml
+++ b/tests/auto/accessibility/data/dial.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Dial {
-        id: dial
-        objectName: "dial"
-    }
-}
+Dial { }
diff --git a/tests/auto/accessibility/data/frame.qml b/tests/auto/accessibility/data/frame.qml
index 8efe3079..6fcbab23 100644
--- a/tests/auto/accessibility/data/frame.qml
+++ b/tests/auto/accessibility/data/frame.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Frame {
-        id: frame
-        objectName: "frame"
-    }
-}
+Frame { }
diff --git a/tests/auto/accessibility/data/groupbox.qml b/tests/auto/accessibility/data/groupbox.qml
index e454cbfd..c48b4847 100644
--- a/tests/auto/accessibility/data/groupbox.qml
+++ b/tests/auto/accessibility/data/groupbox.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    GroupBox {
-        id: groupbox
-        objectName: "groupbox"
-        title: "GroupBox"
-    }
+GroupBox {
+    title: "GroupBox"
 }
diff --git a/tests/auto/accessibility/data/itemdelegate.qml b/tests/auto/accessibility/data/itemdelegate.qml
index 10880c28..9b647315 100644
--- a/tests/auto/accessibility/data/itemdelegate.qml
+++ b/tests/auto/accessibility/data/itemdelegate.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ItemDelegate {
-        id: itemdelegate
-        objectName: "itemdelegate"
-        text: "ItemDelegate"
-    }
+ItemDelegate {
+    text: "ItemDelegate"
 }
diff --git a/tests/auto/accessibility/data/label.qml b/tests/auto/accessibility/data/label.qml
index 409898d4..bb87a4e9 100644
--- a/tests/auto/accessibility/data/label.qml
+++ b/tests/auto/accessibility/data/label.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Label {
-        id: label
-        objectName: "label"
-        text: "Label"
-    }
+Label {
+    text: "Label"
 }
diff --git a/tests/auto/accessibility/data/menu.qml b/tests/auto/accessibility/data/menu.qml
index bb777064..def3020b 100644
--- a/tests/auto/accessibility/data/menu.qml
+++ b/tests/auto/accessibility/data/menu.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Menu {
-        id: menu
-        objectName: "menu"
-    }
-}
+Menu { }
diff --git a/tests/auto/accessibility/data/menuitem.qml b/tests/auto/accessibility/data/menuitem.qml
index 9f7c2a85..70c2ff33 100644
--- a/tests/auto/accessibility/data/menuitem.qml
+++ b/tests/auto/accessibility/data/menuitem.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    MenuItem {
-        id: menuitem
-        objectName: "menuitem"
-        text: "MenuItem"
-    }
+MenuItem {
+    text: "MenuItem"
 }
diff --git a/tests/auto/accessibility/data/monthgrid-2.qml b/tests/auto/accessibility/data/monthgrid-2.qml
index 76af6646..603a208b 100644
--- a/tests/auto/accessibility/data/monthgrid-2.qml
+++ b/tests/auto/accessibility/data/monthgrid-2.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import Qt.labs.calendar 1.0
 
-Window {
-    visible: true
-
-    MonthGrid {
-        id: monthgrid
-        objectName: "monthgrid"
-        title: "MonthGrid"
-    }
+MonthGrid {
+    title: "MonthGrid"
 }
diff --git a/tests/auto/accessibility/data/monthgrid.qml b/tests/auto/accessibility/data/monthgrid.qml
index 7c8d6451..92a45f0f 100644
--- a/tests/auto/accessibility/data/monthgrid.qml
+++ b/tests/auto/accessibility/data/monthgrid.qml
@@ -1,14 +1,7 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import Qt.labs.calendar 1.0
 
-Window {
-    visible: true
-
-    MonthGrid {
-        id: monthgrid
-        objectName: "monthgrid"
-        title: "MonthGrid"
-        Accessible.name: title
-    }
+MonthGrid {
+    title: "MonthGrid"
+    Accessible.name: title
 }
diff --git a/tests/auto/accessibility/data/page.qml b/tests/auto/accessibility/data/page.qml
index c4058b29..59139855 100644
--- a/tests/auto/accessibility/data/page.qml
+++ b/tests/auto/accessibility/data/page.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Page {
-        id: page
-        objectName: "page"
-        title: "Page"
-    }
+Page {
+    title: "Page"
 }
diff --git a/tests/auto/accessibility/data/pageindicator.qml b/tests/auto/accessibility/data/pageindicator.qml
index b42d3f9e..bb69a27a 100644
--- a/tests/auto/accessibility/data/pageindicator.qml
+++ b/tests/auto/accessibility/data/pageindicator.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    PageIndicator {
-        id: pageindicator
-        objectName: "pageindicator"
-    }
-}
+PageIndicator { }
diff --git a/tests/auto/accessibility/data/pane.qml b/tests/auto/accessibility/data/pane.qml
index 9b99d790..1de210ec 100644
--- a/tests/auto/accessibility/data/pane.qml
+++ b/tests/auto/accessibility/data/pane.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Pane {
-        id: pane
-        objectName: "pane"
-    }
-}
+Pane { }
diff --git a/tests/auto/accessibility/data/popup.qml b/tests/auto/accessibility/data/popup.qml
index 70fe2e5f..05e968e5 100644
--- a/tests/auto/accessibility/data/popup.qml
+++ b/tests/auto/accessibility/data/popup.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Popup {
-        id: popup
-        objectName: "popup"
-    }
-}
+Popup { }
diff --git a/tests/auto/accessibility/data/progressbar.qml b/tests/auto/accessibility/data/progressbar.qml
index 283db003..5e9b11f1 100644
--- a/tests/auto/accessibility/data/progressbar.qml
+++ b/tests/auto/accessibility/data/progressbar.qml
@@ -1,15 +1,8 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ProgressBar {
-        id: progressbar
-        objectName: "progressbar"
-        from: 0
-        to: 100
-        value: 50
-    }
+ProgressBar {
+    from: 0
+    to: 100
+    value: 50
 }
diff --git a/tests/auto/accessibility/data/radiobutton.qml b/tests/auto/accessibility/data/radiobutton.qml
index 1883fff8..58bdf225 100644
--- a/tests/auto/accessibility/data/radiobutton.qml
+++ b/tests/auto/accessibility/data/radiobutton.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    RadioButton {
-        id: radiobutton
-        objectName: "radiobutton"
-        text: "RadioButton"
-    }
+RadioButton {
+    text: "RadioButton"
 }
diff --git a/tests/auto/accessibility/data/rangeslider.qml b/tests/auto/accessibility/data/rangeslider.qml
index ce3dc872..45b1d4ae 100644
--- a/tests/auto/accessibility/data/rangeslider.qml
+++ b/tests/auto/accessibility/data/rangeslider.qml
@@ -1,18 +1,11 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    RangeSlider {
-        id: rangeSlider
-        objectName: "rangeslider"
-        from: 0
-        to: 100
-        first.value: 25
-        second.value: 75
-        stepSize: 1
-        orientation: "Horizontal"
-    }
+RangeSlider {
+    from: 0
+    to: 100
+    first.value: 25
+    second.value: 75
+    stepSize: 1
+    orientation: Qt.Horizontal
 }
diff --git a/tests/auto/accessibility/data/scrollbar.qml b/tests/auto/accessibility/data/scrollbar.qml
index 2e360422..f0598b4b 100644
--- a/tests/auto/accessibility/data/scrollbar.qml
+++ b/tests/auto/accessibility/data/scrollbar.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ScrollBar {
-        id: scrollbar
-        objectName: "scrollbar"
-    }
-}
+ScrollBar { }
diff --git a/tests/auto/accessibility/data/scrollindicator.qml b/tests/auto/accessibility/data/scrollindicator.qml
index e933dece..4cb81c4e 100644
--- a/tests/auto/accessibility/data/scrollindicator.qml
+++ b/tests/auto/accessibility/data/scrollindicator.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ScrollIndicator {
-        id: scrollindicator
-        objectName: "scrollindicator"
-    }
-}
+ScrollIndicator { }
diff --git a/tests/auto/accessibility/data/slider.qml b/tests/auto/accessibility/data/slider.qml
index 060bb66c..775ce7d0 100644
--- a/tests/auto/accessibility/data/slider.qml
+++ b/tests/auto/accessibility/data/slider.qml
@@ -1,17 +1,10 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Slider {
-        id: slider
-        objectName: "slider"
-        from: 0
-        to: 100
-        value: 50
-        stepSize: 1
-        orientation: "Horizontal"
-    }
+Slider {
+    from: 0
+    to: 100
+    value: 50
+    stepSize: 1
+    orientation: Qt.Horizontal
 }
diff --git a/tests/auto/accessibility/data/spinbox.qml b/tests/auto/accessibility/data/spinbox.qml
index 9d29bccc..029cbc65 100644
--- a/tests/auto/accessibility/data/spinbox.qml
+++ b/tests/auto/accessibility/data/spinbox.qml
@@ -1,16 +1,9 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    SpinBox {
-        id: spinbox
-        objectName: "spinbox"
-        from: 0
-        to: 100
-        value: 50
-        stepSize: 1
-    }
+SpinBox {
+    from: 0
+    to: 100
+    value: 50
+    stepSize: 1
 }
diff --git a/tests/auto/accessibility/data/switch.qml b/tests/auto/accessibility/data/switch.qml
index 9913e3f1..8bb43893 100644
--- a/tests/auto/accessibility/data/switch.qml
+++ b/tests/auto/accessibility/data/switch.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    Switch {
-        //id: switch
-        objectName: "switch"
-        text: "Switch"
-    }
+Switch {
+    text: "Switch"
 }
diff --git a/tests/auto/accessibility/data/switchdelegate.qml b/tests/auto/accessibility/data/switchdelegate.qml
index ae9b95f1..9f2324c0 100644
--- a/tests/auto/accessibility/data/switchdelegate.qml
+++ b/tests/auto/accessibility/data/switchdelegate.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    SwitchDelegate {
-        id: switchdelegate
-        objectName: "switchdelegate"
-        text: "SwitchDelegate"
-    }
+SwitchDelegate {
+    text: "SwitchDelegate"
 }
diff --git a/tests/auto/accessibility/data/tabbar.qml b/tests/auto/accessibility/data/tabbar.qml
index 127c4e81..4b1f73a1 100644
--- a/tests/auto/accessibility/data/tabbar.qml
+++ b/tests/auto/accessibility/data/tabbar.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    TabBar {
-        id: tabbar
-        objectName: "tabbar"
-    }
-}
+TabBar { }
diff --git a/tests/auto/accessibility/data/tabbutton.qml b/tests/auto/accessibility/data/tabbutton.qml
index cfb04ca2..6b979bc8 100644
--- a/tests/auto/accessibility/data/tabbutton.qml
+++ b/tests/auto/accessibility/data/tabbutton.qml
@@ -1,17 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    TabBar {
-        id: tabbar
-        objectName: "TabBar"
-        TabButton {
-            id: tabbutton
-            objectName: "tabbutton"
-            text: "TabButton"
-        }
-    }
+TabButton {
+    text: "TabButton"
 }
diff --git a/tests/auto/accessibility/data/textarea.qml b/tests/auto/accessibility/data/textarea.qml
index 381c08bd..93b5b220 100644
--- a/tests/auto/accessibility/data/textarea.qml
+++ b/tests/auto/accessibility/data/textarea.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    TextArea {
-        id: textarea
-        objectName: "textarea"
-        text: "TextArea"
-    }
+TextArea {
+    text: "TextArea"
 }
diff --git a/tests/auto/accessibility/data/textfield.qml b/tests/auto/accessibility/data/textfield.qml
index 5db46d82..06ba1a58 100644
--- a/tests/auto/accessibility/data/textfield.qml
+++ b/tests/auto/accessibility/data/textfield.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    TextField {
-        id: textfield
-        objectName: "textfield"
-        text: "TextField"
-    }
+TextField {
+    text: "TextField"
 }
diff --git a/tests/auto/accessibility/data/toolbar.qml b/tests/auto/accessibility/data/toolbar.qml
index c0503aef..7b3ba07f 100644
--- a/tests/auto/accessibility/data/toolbar.qml
+++ b/tests/auto/accessibility/data/toolbar.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ToolBar {
-        id: toolbar
-        objectName: "toolbar"
-    }
-}
+ToolBar { }
diff --git a/tests/auto/accessibility/data/toolbutton.qml b/tests/auto/accessibility/data/toolbutton.qml
index 63aacddc..79f155ec 100644
--- a/tests/auto/accessibility/data/toolbutton.qml
+++ b/tests/auto/accessibility/data/toolbutton.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ToolButton {
-        id: toolbutton
-        objectName: "toolbutton"
-        text: "ToolButton"
-    }
+ToolButton {
+    text: "ToolButton"
 }
diff --git a/tests/auto/accessibility/data/tooltip.qml b/tests/auto/accessibility/data/tooltip.qml
index 4a2f16b5..1d1bae28 100644
--- a/tests/auto/accessibility/data/tooltip.qml
+++ b/tests/auto/accessibility/data/tooltip.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.0
 
-Window {
-    visible: true
-
-    ToolTip {
-        id: tooltip
-        objectName: "tooltip"
-        text: "ToolTip"
-    }
+ToolTip {
+    text: "ToolTip"
 }
diff --git a/tests/auto/accessibility/data/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/weeknumbercolumn-2.qml
index bc3b1739..7d682315 100644
--- a/tests/auto/accessibility/data/weeknumbercolumn-2.qml
+++ b/tests/auto/accessibility/data/weeknumbercolumn-2.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import Qt.labs.calendar 1.0
 
-Window {
-    visible: true
-
-    WeekNumberColumn {
-        id: weeknumbercolumn
-        objectName: "weeknumbercolumn"
-    }
-}
+WeekNumberColumn { }
diff --git a/tests/auto/accessibility/data/weeknumbercolumn.qml b/tests/auto/accessibility/data/weeknumbercolumn.qml
index 7fadb5da..6b024872 100644
--- a/tests/auto/accessibility/data/weeknumbercolumn.qml
+++ b/tests/auto/accessibility/data/weeknumbercolumn.qml
@@ -1,13 +1,6 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import Qt.labs.calendar 1.0
 
-Window {
-    visible: true
-
-    WeekNumberColumn {
-        id: weeknumbercolumn
-        objectName: "weeknumbercolumn"
-        Accessible.name: "WeekNumberColumn"
-    }
+WeekNumberColumn {
+    Accessible.name: "WeekNumberColumn"
 }
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp
index c1c9cb25..1086c17e 100644
--- a/tests/auto/accessibility/tst_accessibility.cpp
+++ b/tests/auto/accessibility/tst_accessibility.cpp
@@ -34,27 +34,21 @@
 **
 ****************************************************************************/
 
-#include <qtest.h>
-#include <QtTest/QSignalSpy>
+#include <QtTest/qtest.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlcontext.h>
-#include <QtQuick/qquickview.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuickTemplates2/private/qquickpopup_p.h>
 #include "../shared/util.h"
-#include "../shared/visualtestutil.h"
 
 #ifndef QT_NO_ACCESSIBILITY
 #include <QtQuick/private/qquickaccessibleattached_p.h>
 #endif
 
-using namespace QQuickVisualTestUtil;
-
 class tst_accessibility : public QQmlDataTest
 {
     Q_OBJECT
-public:
 
 private slots:
     void a11y_data();
@@ -127,7 +121,6 @@ void tst_accessibility::a11y()
     QFETCH(int, role);
     QFETCH(QString, text);
 
-    QQmlComponent component(&engine);
     QString fn = name;
 #ifdef QT_NO_ACCESSIBILITY
     if (name == QLatin1Literal("dayofweekrow")
@@ -135,20 +128,16 @@ void tst_accessibility::a11y()
             || name == QLatin1Literal("weeknumbercolumn"))
         fn += QLatin1Literal("-2");
 #endif
+
+    QQmlComponent component(&engine);
     component.loadUrl(testFileUrl(fn + ".qml"));
-    QObject* created = component.create();
-    QVERIFY2(created, qPrintable(component.errorString()));
-    QScopedPointer<QObject> cleanup(created);
-    QVERIFY(!cleanup.isNull());
 
-    QQuickWindow* window = qobject_cast<QQuickWindow*>(created);
-    QVERIFY(window);
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
 
-    QQuickItem *item = findItem<QQuickItem>(window->contentItem(), name);
+    QQuickItem *item = qobject_cast<QQuickItem *>(object.data());
     if (!item) {
-        QQuickPopup *popup = window->contentItem()->findChild<QQuickPopup *>(name);
+        QQuickPopup *popup = qobject_cast<QQuickPopup *>(object.data());
         if (popup)
             item = popup->popupItem();
     }