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

4 files changed, 235 insertions, 5 deletions

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"