Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/imports/controls/Drawer.qml
	src/imports/controls/Frame.qml
	src/imports/controls/GroupBox.qml
	src/imports/controls/Page.qml
	src/imports/controls/Pane.qml
	src/imports/controls/ToolBar.qml
	src/imports/controls/Tumbler.qml
	src/quicktemplates2/qquickapplicationwindow.cpp
	src/quicktemplates2/qquickpopup.cpp
	tests/auto/accessibility/data/busyindicator.qml
	tests/auto/accessibility/data/button.qml
	tests/auto/accessibility/data/checkbox.qml
	tests/auto/accessibility/data/control.qml
	tests/auto/accessibility/data/dial.qml
	tests/auto/accessibility/data/label.qml
	tests/auto/accessibility/data/menu.qml
	tests/auto/accessibility/data/pageindicator.qml
	tests/auto/accessibility/data/popup.qml
	tests/auto/accessibility/data/progressbar.qml
	tests/auto/accessibility/data/radiobutton.qml
	tests/auto/accessibility/data/rangeslider.qml
	tests/auto/accessibility/data/scrollbar.qml
	tests/auto/accessibility/data/scrollindicator.qml
	tests/auto/accessibility/data/slider.qml
	tests/auto/accessibility/data/spinbox.qml
	tests/auto/accessibility/data/switch.qml
	tests/auto/accessibility/data/tabbar.qml
	tests/auto/accessibility/data/tabbutton.qml
	tests/auto/accessibility/data/textarea.qml
	tests/auto/accessibility/data/textfield.qml
	tests/auto/accessibility/data/toolbar.qml
	tests/auto/accessibility/data/toolbutton.qml
	tests/auto/accessibility/tst_accessibility.cpp

Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6

46 files changed, 370 insertions, 315 deletions

diff --git a/tests/auto/accessibility/data/busyindicator.qml b/tests/auto/accessibility/data/busyindicator.qml
index 6806d64b..5a1cf54a 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.1
 
-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 100da3d4..ecaba6cc 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.1
 
-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 fcd4628c..cb46c074 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.1
 
-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
new file mode 100644
index 00000000..f911caf0
--- /dev/null
+++ b/tests/auto/accessibility/data/checkdelegate.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+CheckDelegate {
+    text: "CheckDelegate"
+}
diff --git a/tests/auto/accessibility/data/combobox.qml b/tests/auto/accessibility/data/combobox.qml
new file mode 100644
index 00000000..52931968
--- /dev/null
+++ b/tests/auto/accessibility/data/combobox.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+ComboBox {
+    model: ["ComboBox"]
+}
diff --git a/tests/auto/accessibility/data/control.qml b/tests/auto/accessibility/data/control.qml
index d177e7e3..a8fd0613 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.1
 
-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 4725d557..354ccdbd 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.1
 
-Window {
-    visible: true
-
-    Dial {
-        id: dial
-        objectName: "dial"
-    }
-}
+Dial { }
diff --git a/tests/auto/accessibility/data/dialog.qml b/tests/auto/accessibility/data/dialog.qml
index df0257e8..46a96f2e 100644
--- a/tests/auto/accessibility/data/dialog.qml
+++ b/tests/auto/accessibility/data/dialog.qml
@@ -1,12 +1,4 @@
 import QtQuick 2.5
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.1
 
-Window {
-    visible: true
-
-    Dialog {
-        id: dialog
-        objectName: "dialog"
-    }
-}
+Dialog { }
diff --git a/tests/auto/accessibility/data/frame.qml b/tests/auto/accessibility/data/frame.qml
new file mode 100644
index 00000000..6a2ec40e
--- /dev/null
+++ b/tests/auto/accessibility/data/frame.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+Frame { }
diff --git a/tests/auto/accessibility/data/groupbox.qml b/tests/auto/accessibility/data/groupbox.qml
new file mode 100644
index 00000000..ebb3cf7d
--- /dev/null
+++ b/tests/auto/accessibility/data/groupbox.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+GroupBox {
+    title: "GroupBox"
+}
diff --git a/tests/auto/accessibility/data/itemdelegate.qml b/tests/auto/accessibility/data/itemdelegate.qml
new file mode 100644
index 00000000..91e1d910
--- /dev/null
+++ b/tests/auto/accessibility/data/itemdelegate.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+ItemDelegate {
+    text: "ItemDelegate"
+}
diff --git a/tests/auto/accessibility/data/label.qml b/tests/auto/accessibility/data/label.qml
index 4904bb41..e799f8de 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.1
 
-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 589f4aaf..b931644a 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.1
 
-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
new file mode 100644
index 00000000..308c1c2b
--- /dev/null
+++ b/tests/auto/accessibility/data/menuitem.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+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
new file mode 100644
index 00000000..cda7b80b
--- /dev/null
+++ b/tests/auto/accessibility/data/page.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+Page {
+    title: "Page"
+}
diff --git a/tests/auto/accessibility/data/pageindicator.qml b/tests/auto/accessibility/data/pageindicator.qml
index 666414e7..a882296e 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.1
 
-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
new file mode 100644
index 00000000..24856e26
--- /dev/null
+++ b/tests/auto/accessibility/data/pane.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+Pane { }
diff --git a/tests/auto/accessibility/data/popup.qml b/tests/auto/accessibility/data/popup.qml
index 47e8a04a..e1d9f8ff 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.1
 
-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 23cb3731..c8733d5d 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.1
 
-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 e36944cd..1ca431f5 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.1
 
-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 ac173034..76736fb8 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.1
 
-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 f20bca0a..1420ed19 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.1
 
-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 7d2d5532..34e429ad 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.1
 
-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 565d98a9..088bd23a 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.1
 
-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 9a0ab5ef..07e2a54e 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.1
 
-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 17315096..0678f113 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.1
 
-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
new file mode 100644
index 00000000..fba0c321
--- /dev/null
+++ b/tests/auto/accessibility/data/switchdelegate.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+SwitchDelegate {
+    text: "SwitchDelegate"
+}
diff --git a/tests/auto/accessibility/data/tabbar.qml b/tests/auto/accessibility/data/tabbar.qml
index 692e6b2c..209a094f 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.1
 
-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 c5fe646f..c76e9048 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.1
 
-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 7c4aa977..1ffe366f 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.1
 
-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 7c7cd009..f87957eb 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.1
 
-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 51ba454c..e1887de4 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.1
 
-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 ed44c8af..e088bb56 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.1
 
-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
new file mode 100644
index 00000000..dcb5b3b9
--- /dev/null
+++ b/tests/auto/accessibility/data/tooltip.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.1
+
+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 fc3be1cb..53cb6973 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();
@@ -73,12 +67,18 @@ void tst_accessibility::a11y_data()
     QTest::newRow("BusyIndicator") << "busyindicator" << 0x00000027 << ""; //QAccessible::Indicator
     QTest::newRow("Button") << "button" << 0x0000002B << "Button"; //QAccessible::Button
     QTest::newRow("CheckBox") << "checkbox" << 0x0000002C << "CheckBox"; //QAccessible::CheckBox
+    QTest::newRow("CheckDelegate") << "checkdelegate" << 0x0000002C << "CheckDelegate"; //QAccessible::CheckBox
+    QTest::newRow("ComboBox") << "combobox" << 0x0000002E << "ComboBox"; //QAccessible::ComboBox
     QTest::newRow("Dialog") << "dialog" << 0x00000012 << ""; //QAccessible::Dialog
-    // Frame
-    // GroupBox
+    QTest::newRow("Frame") << "frame" << 0x00000013 << ""; //QAccessible::Border
+    QTest::newRow("GroupBox") << "groupbox" << 0x00000014 << "GroupBox"; //QAccessible::Grouping
+    QTest::newRow("ItemDelegate") << "itemdelegate" << 0x00000022 << "ItemDelegate"; //QAccessible::ListItem
     QTest::newRow("Label") << "label" << 0x00000029 << "Label"; //QAccessible::StaticText
     QTest::newRow("Menu") << "menu" << 0x0000000B << ""; //QAccessible::PopupMenu
+    QTest::newRow("MenuItem") << "menuitem" << 0x0000000C << "MenuItem"; //QAccessible::MenuItem
+    QTest::newRow("Page") << "page" << 0x00000025 << "Page"; //QAccessible::PageTab
     QTest::newRow("PageIndicator") << "pageindicator" << 0x00000027 << ""; //QAccessible::Indicator
+    QTest::newRow("Pane") << "pane" << 0x00000010 << ""; //QAccessible::Pane
     QTest::newRow("Popup") << "popup" << 0x00000080 << ""; //QAccessible::LayeredPane
     QTest::newRow("ProgressBar") << "progressbar" << 0x00000030 << ""; //QAccessible::ProgressBar
     QTest::newRow("RadioButton") << "radiobutton" << 0x0000002D << "RadioButton"; //QAccessible::RadioButton
@@ -89,12 +89,14 @@ void tst_accessibility::a11y_data()
     QTest::newRow("SpinBox") << "spinbox" << 0x00000034 << ""; //QAccessible::SpinBox
     // StackView
     QTest::newRow("Switch") << "switch" << 0x0000002B << "Switch"; //QAccessible::Button
+    QTest::newRow("SwitchDelegate") << "switchdelegate" << 0x00000022 << "SwitchDelegate"; //QAccessible::ListItem
     QTest::newRow("TabBar") << "tabbar" << 0x0000003C << ""; //QAccessible::PageTabList
     QTest::newRow("TabButton") << "tabbutton" << 0x00000025 << "TabButton"; //QAccessible::PageTab
     QTest::newRow("TextArea") << "textarea" << 0x0000002A << ""; //QAccessible::Accessible.EditableText
     QTest::newRow("TextField") << "textfield" << 0x0000002A << ""; //QAccessible::Accessible.EditableText
     QTest::newRow("ToolBar") << "toolbar" << 0x00000016 << ""; //QAccessible::ToolBar
     QTest::newRow("ToolButton") << "toolbutton" << 0x0000002B << "ToolButton"; //QAccessible::Button
+    QTest::newRow("ToolTip") << "tooltip" << 0x0000000D << "ToolTip"; //QAccessible::ToolTip
 
     QTest::newRow("Dial") << "dial" << 0x00000031 << ""; //QAccessible::Dial
     // Drawer
@@ -120,7 +122,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")
@@ -128,20 +129,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();
     }
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index b74911c7..cc0c4de3 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -468,7 +468,6 @@ TestCase {
         // hide popup
         keyPress(data.key2)
         compare(control.pressed, data.hidePress)
-        compare(control.popup.visible, data.showPopup)
         keyRelease(data.key2)
         compare(control.pressed, false)
         tryCompare(control.popup, "visible", !data.hidePopup)
diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
index 3054fe22..bb7efc5d 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
@@ -51,7 +51,7 @@ Window {
 
     BusyIndicator {
         id: busyIndicator
-        running: false
+        running: true
         anchors.centerIn: parent
     }
 }
diff --git a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/gifs/data/qtquickcontrols2-drawer.qml
new file mode 100644
index 00000000..49f2cf50
--- /dev/null
+++ b/tests/manual/gifs/data/qtquickcontrols2-drawer.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Window 2.0
+
+ApplicationWindow {
+    id: window
+    width: 300
+    height: 300
+    visible: true
+
+    property alias drawer: drawer
+
+    Drawer {
+        id: drawer
+        width: window.width * 0.66
+        height: window.height
+        rightPadding: 0
+
+        Rectangle {
+            border.width: 1
+            anchors.fill: parent
+
+            Label {
+                text: "Drawer"
+                font.pixelSize: 32
+                anchors.centerIn: parent
+            }
+        }
+    }
+
+    Rectangle {
+        border.width: 1
+        anchors.fill: parent
+
+        Label {
+            text: "Content"
+            font.pixelSize: 32
+            anchors.centerIn: parent
+        }
+    }
+
+    Rectangle {
+        z: 1
+        color: "black"
+        width: 1
+        height: parent.height
+        parent: window.overlay
+    }
+}
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml
new file mode 100644
index 00000000..d721591a
--- /dev/null
+++ b/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Window 2.0
+import QtQuick.Controls 2.0
+
+Window {
+    width: 300
+    height: 300
+    visible: true
+
+    property alias swipeView: view
+
+    Rectangle {
+        border.width: 1
+        anchors.fill: parent
+    }
+
+    SwipeView {
+        id: view
+        anchors.fill: parent
+
+        Label {
+            text: "First\nPage"
+            horizontalAlignment: Qt.AlignHCenter
+            verticalAlignment: Qt.AlignVCenter
+        }
+
+        Label {
+            text: "Second\nPage"
+            horizontalAlignment: Qt.AlignHCenter
+            verticalAlignment: Qt.AlignVCenter
+        }
+
+        Label {
+            text: "Third\nPage"
+            horizontalAlignment: Qt.AlignHCenter
+            verticalAlignment: Qt.AlignVCenter
+        }
+    }
+
+    PageIndicator {
+        id: indicator
+
+        count: view.count
+        currentIndex: view.currentIndex
+
+        anchors.bottom: view.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+}
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp
index 5e6de547..8849e593 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/gifs/tst_gifs.cpp
@@ -60,6 +60,7 @@ private slots:
     void button();
     void tabBar();
     void menu();
+    void swipeView();
     void swipeDelegate_data();
     void swipeDelegate();
     void swipeDelegateBehind();
@@ -78,6 +79,7 @@ private slots:
     void comboBox();
     void stackView_data();
     void stackView();
+    void drawer();
 
 private:
     void moveSmoothly(QQuickWindow *window, const QPoint &from, const QPoint &to, int movements,
@@ -353,7 +355,7 @@ void tst_Gifs::busyIndicator()
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
-    gifRecorder.setRecordingDuration(3);
+    gifRecorder.setRecordingDuration(6);
     gifRecorder.setHighQuality(true);
     gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml");
 
@@ -361,17 +363,17 @@ void tst_Gifs::busyIndicator()
 
     QQuickWindow *window = gifRecorder.window();
     // Record nothing for a bit to make it smoother.
-    QTest::qWait(400);
+    QTest::qWait(800 * 2);
 
     QQuickItem *busyIndicator = window->property("busyIndicator").value<QQuickItem*>();
     QVERIFY(busyIndicator);
 
-    busyIndicator->setProperty("running", true);
+    busyIndicator->setProperty("running", false);
 
     // 800 ms is the duration of one rotation animation cycle for BusyIndicator.
     QTest::qWait(800 * 2);
 
-    busyIndicator->setProperty("running", false);
+    busyIndicator->setProperty("running", true);
 
     gifRecorder.waitForFinish();
 }
@@ -483,6 +485,31 @@ void tst_Gifs::menu()
     gifRecorder.waitForFinish();
 }
 
+void tst_Gifs::swipeView()
+{
+    GifRecorder gifRecorder;
+    gifRecorder.setDataDirPath(dataDirPath);
+    gifRecorder.setOutputDir(outputDir);
+    gifRecorder.setRecordingDuration(8);
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-swipeview.qml"));
+    gifRecorder.setHighQuality(true);
+
+    gifRecorder.start();
+
+    QQuickWindow *window = gifRecorder.window();
+    QQuickItem *swipeView = window->property("swipeView").value<QQuickItem*>();
+    QVERIFY(swipeView);
+
+    QTest::qWait(1200);
+    swipeView->setProperty("currentIndex", 1);
+    QTest::qWait(2000);
+    swipeView->setProperty("currentIndex", 2);
+    QTest::qWait(2000);
+    swipeView->setProperty("currentIndex", 0);
+
+    gifRecorder.waitForFinish();
+}
+
 void tst_Gifs::swipeDelegate_data()
 {
     QTest::addColumn<QString>("qmlFileName");
@@ -914,6 +941,31 @@ void tst_Gifs::stackView()
     gifRecorder.waitForFinish();
 }
 
+void tst_Gifs::drawer()
+{
+    GifRecorder gifRecorder;
+    gifRecorder.setDataDirPath(dataDirPath);
+    gifRecorder.setOutputDir(outputDir);
+    gifRecorder.setRecordingDuration(4);
+    gifRecorder.setHighQuality(true);
+    gifRecorder.setQmlFileName("qtquickcontrols2-drawer.qml");
+
+    gifRecorder.start();
+
+    QQuickWindow *window = gifRecorder.window();
+    QObject *drawer = window->property("drawer").value<QObject*>();
+    qreal width = drawer->property("width").toReal();
+
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1), 100);
+    moveSmoothly(window, QPoint(1, 1), QPoint(width, 1), width, QEasingCurve::InOutBack, 1);
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(width, 1), 30);
+
+    QTest::qWait(1000);
+    QMetaObject::invokeMethod(drawer, "close");
+
+    gifRecorder.waitForFinish();
+}
+
 QTEST_MAIN(tst_Gifs)
 
 #include "tst_gifs.moc"