Remove qtquickcontrols2 sources and explain where they wentHEADdev

Now that qtquickcontrols2 has been merged into qtdeclarative,
we should make it obvious that this repo should no longer be
used, by preventing it from being built.

Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>

20 files changed, 0 insertions, 2720 deletions

diff --git a/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST b/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST
deleted file mode 100644
index 9f3f96be..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-# See qtbase/src/testlib/qtestblacklist.cpp for format
-
-# QTBUG-77946
-[slider]
-opensuse-leap
-
-[position]
-opensuse-leap
diff --git a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt b/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
deleted file mode 100644
index 8eb1f148..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# Generated from qquickdrawer.pro.
-
-#####################################################################
-## tst_qquickdrawer Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qquickdrawer
-    SOURCES
-        ../shared/qtest_quickcontrols.h
-        ../shared/util.cpp ../shared/util.h
-        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
-        tst_qquickdrawer.cpp
-    DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::QmlPrivate
-        Qt::QuickControls2
-        Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::QuickTest
-        Qt::TestPrivate
-    TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qquickdrawer.pro:<TRUE>:
-# OTHER_FILES = "data/*.qml"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\":/data\\\"
-)
-
-qt_internal_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS
-    DEFINES
-        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
-)
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml
deleted file mode 100644
index a7c70e04..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: 200
-
-        Button {
-            text: "Button"
-            anchors.fill: parent
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml
deleted file mode 100644
index 8b8efb48..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias backgroundButton: backgroundButton
-    property alias drawerButton: drawerButton
-
-    Button {
-        id: backgroundButton
-        text: "Background"
-        anchors.fill: parent
-    }
-
-    Drawer {
-        id: drawer
-        width: 100
-        height: 400
-        topPadding: 2
-        leftPadding: 2
-        rightPadding: 2
-        bottomPadding: 2
-
-        contentItem: Button {
-            id: drawerButton
-            text: "Drawer"
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml
deleted file mode 100644
index 449fbadb..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias drawerSlider: drawerSlider
-    property alias contentSlider: contentSlider
-
-    Slider {
-        id: contentSlider
-        anchors.fill: parent
-        wheelEnabled: true
-    }
-
-    Drawer {
-        id: drawer
-        edge: Qt.RightEdge
-        width: window.width * 0.8
-        height: window.height
-        clip: true
-        contentItem: Slider {
-            id: drawerSlider
-            wheelEnabled: true
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml
deleted file mode 100644
index 3f2ed118..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: 200
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml
deleted file mode 100644
index 6d2951f7..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias popup: popup
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: parent.height
-        dragMargin: parent.width
-    }
-
-    Popup {
-        id: popup
-        modal: true
-        x: (parent.width - width) / 2
-        y: (parent.height - height) / 2
-        width: parent.width / 2
-        height: parent.height / 2
-
-        Rectangle {
-            objectName: "shadow"
-            parent: popup.background
-            anchors.fill: parent
-            anchors.margins: -20
-
-            z: -1
-            opacity: 0.5
-            color: "silver"
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml b/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml
deleted file mode 100644
index b3f98d9e..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias flickable: flickable
-
-    Drawer {
-        id: drawer
-        width: 300
-        height: 400
-
-        contentItem: ListView {
-            id: flickable
-            model: 100
-            delegate: ItemDelegate {
-                width: flickable.width
-                text: index
-            }
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml b/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml
deleted file mode 100644
index bd1b84aa..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias popup: popup
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: parent.height
-    }
-
-    Popup {
-        id: popup
-        x: 200
-        width: 200
-        height: parent.height
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/header.qml b/tests/auto/quickcontrols2/qquickdrawer/data/header.qml
deleted file mode 100644
index dfd64ab1..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/header.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias button: button
-
-    header: ToolBar {
-        ToolButton {
-            id: button
-            text: "="
-        }
-    }
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: parent.height
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml b/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml
deleted file mode 100644
index 03b69c4e..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias popup: popup
-    property alias button: button
-
-    Drawer {
-        id: drawer
-        width: window.width / 2
-        height: parent.height
-        dragMargin: parent.width
-    }
-
-    Popup {
-        id: popup
-        x: 10; y: 10
-        width: window.width - 10
-        height: window.height - 10
-
-        Button {
-            id: button
-            text: "Button"
-            anchors.fill: parent
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml b/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml
deleted file mode 100644
index d4d5fbd6..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias leftDrawer: leftDrawer
-    property alias leftButton: leftButton
-
-    property alias rightDrawer: rightDrawer
-    property alias rightButton: rightButton
-
-    property alias contentButton: contentButton
-
-    Drawer {
-        id: leftDrawer
-        width: 300
-        height: 400
-        z: 1
-
-        contentItem: Button {
-            id: leftButton
-            text: "Left"
-        }
-    }
-
-    Button {
-        id: contentButton
-        text: "Content"
-        anchors.fill: parent
-    }
-
-    Drawer {
-        id: rightDrawer
-        width: 300
-        height: 400
-        edge: Qt.RightEdge
-
-        contentItem: Button {
-            id: rightButton
-            text: "Right"
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml b/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml
deleted file mode 100644
index e3211fab..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias drawer2: drawer2
-
-    header: Item { implicitHeight: 50 }
-    footer: Item { implicitHeight: 50 }
-
-    Drawer {
-        id: drawer
-        width: parent.width / 2
-        implicitHeight: parent.height
-    }
-
-    Drawer {
-        id: drawer2
-        width: Math.min(window.width, window.height) / 3 * 2
-        height: window.height
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml b/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml
deleted file mode 100644
index b3db5a7b..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias slider: slider
-
-    Drawer {
-        id: drawer
-        width: 300
-        height: 400
-        position: 1.0
-        visible: true
-
-        Slider {
-            id: slider
-            value: 1
-            width: parent.width
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml
deleted file mode 100644
index d2aaf486..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Controls
-
-ApplicationWindow {
-    id: window
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-
-    header: Rectangle {
-        color: "red"
-        height: 40
-    }
-
-    Drawer {
-        id: drawer
-        width: window.width
-        height: window.height * 0.2
-        parent: window.contentItem
-        edge: Qt.TopEdge
-
-        Label {
-            anchors.centerIn: parent
-            text: "a drawer"
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml
deleted file mode 100644
index 02247dd0..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Window
-import QtQuick.Controls
-
-Window {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: 200
-
-        Button {
-            text: "Button"
-            anchors.fill: parent
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml
deleted file mode 100644
index e0b016cc..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Window
-import QtQuick.Controls
-
-Window {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias backgroundButton: backgroundButton
-    property alias drawerButton: drawerButton
-
-    Button {
-        id: backgroundButton
-        text: "Background"
-        anchors.fill: parent
-    }
-
-    Drawer {
-        id: drawer
-        width: 100
-        height: 400
-        topPadding: 2
-        leftPadding: 2
-        rightPadding: 2
-        bottomPadding: 2
-
-        contentItem: Button {
-            id: drawerButton
-            text: "Drawer"
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml
deleted file mode 100644
index e9c2eb42..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Window
-import QtQuick.Controls
-
-Window {
-    id: window
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-    property alias drawerSlider: drawerSlider
-    property alias contentSlider: contentSlider
-
-    Slider {
-        id: contentSlider
-        anchors.fill: parent
-        wheelEnabled: true
-    }
-
-    Drawer {
-        id: drawer
-        edge: Qt.RightEdge
-        width: window.width * 0.8
-        height: window.height
-        clip: true
-        contentItem: Slider {
-            id: drawerSlider
-            wheelEnabled: true
-        }
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window.qml
deleted file mode 100644
index 4bd9c9d2..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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
-import QtQuick.Window
-import QtQuick.Controls
-
-Window {
-    width: 400
-    height: 400
-
-    property alias drawer: drawer
-
-    Drawer {
-        id: drawer
-        width: 200
-        height: 200
-    }
-}
diff --git a/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp b/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp
deleted file mode 100644
index 2c7ec045..00000000
--- a/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp
+++ /dev/null
@@ -1,1352 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/qtest.h>
-#include <QtTest/qsignalspy.h>
-#include "../shared/util.h"
-#include "../shared/visualtestutil.h"
-#include "../shared/qtest_quickcontrols.h"
-
-#include <QtGui/qpointingdevice.h>
-#include <QtGui/qstylehints.h>
-#include <QtGui/qguiapplication.h>
-#include <QtGui/qpa/qwindowsysteminterface.h>
-#include <QtQuick/private/qquickwindow_p.h>
-#include <QtQuick/private/qquickflickable_p.h>
-#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
-#include <QtQuickTemplates2/private/qquickoverlay_p.h>
-#include <QtQuickTemplates2/private/qquickpopup_p_p.h>
-#include <QtQuickTemplates2/private/qquickdrawer_p.h>
-#include <QtQuickTemplates2/private/qquickbutton_p.h>
-#include <QtQuickTemplates2/private/qquickslider_p.h>
-
-using namespace QQuickVisualTestUtil;
-
-class tst_QQuickDrawer : public QQmlDataTest
-{
-    Q_OBJECT
-
-private slots:
-    void initTestCase() override;
-
-    void defaults();
-    void invalidEdge();
-
-    void visible_data();
-    void visible();
-
-    void state();
-
-    void position_data();
-    void position();
-
-    void dragMargin_data();
-    void dragMargin();
-
-    void reposition();
-    void header();
-
-    void hover_data();
-    void hover();
-
-    void wheel_data();
-    void wheel();
-
-    void multiple();
-
-    void touch_data();
-    void touch();
-
-    void multiTouch();
-
-    void grabber();
-
-    void interactive_data();
-    void interactive();
-
-    void flickable_data();
-    void flickable();
-
-    void dragOverModalShadow_data();
-    void dragOverModalShadow();
-
-    void nonModal_data();
-    void nonModal();
-
-    void slider_data();
-    void slider();
-
-    void topEdgeScreenEdge();
-
-private:
-    QScopedPointer<QPointingDevice> touchDevice;
-};
-
-
-void tst_QQuickDrawer::initTestCase()
-{
-    QQmlDataTest::initTestCase();
-    qputenv("QML_NO_TOUCH_COMPRESSION", "1");
-
-    touchDevice.reset(QTest::createTouchDevice());
-}
-
-void tst_QQuickDrawer::defaults()
-{
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("window.qml"));
-
-    QScopedPointer<QObject> root(component.create());
-    QVERIFY2(!root.isNull(), qPrintable(component.errorString()));
-
-    QQuickDrawer *drawer = root->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-    QCOMPARE(drawer->edge(), Qt::LeftEdge);
-    QCOMPARE(drawer->position(), 0.0);
-    QCOMPARE(drawer->dragMargin(), qGuiApp->styleHints()->startDragDistance());
-}
-
-void tst_QQuickDrawer::invalidEdge()
-{
-    QQmlEngine engine;
-    QQmlComponent component(&engine);
-    component.loadUrl(testFileUrl("window.qml"));
-
-    QScopedPointer<QObject> root(component.create());
-    QVERIFY2(!root.isNull(), qPrintable(component.errorString()));
-
-    QQuickDrawer *drawer = root->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    // Test an invalid value - it should warn and ignore it.
-    QTest::ignoreMessage(QtWarningMsg, qUtf8Printable(testFileUrl("window.qml").toString() + ":61:5: QML Drawer: invalid edge value - valid values are: Qt.TopEdge, Qt.LeftEdge, Qt.RightEdge, Qt.BottomEdge"));
-    drawer->setEdge(static_cast<Qt::Edge>(QQuickDrawer::Right));
-    QCOMPARE(drawer->edge(), Qt::LeftEdge);
-}
-
-void tst_QQuickDrawer::visible_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::newRow("Window") << "window.qml";
-    QTest::newRow("ApplicationWindow") << "applicationwindow.qml";
-}
-
-void tst_QQuickDrawer::visible()
-{
-    QFETCH(QString, source);
-    QQuickApplicationHelper helper(this, source);
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-    QQuickItem *popupItem = drawer->popupItem();
-
-    QCOMPARE(drawer->isVisible(), false);
-    QCOMPARE(drawer->position(), qreal(0.0));
-
-    QQuickOverlay *overlay = QQuickOverlay::overlay(window);
-    QVERIFY(overlay);
-    QVERIFY(!overlay->childItems().contains(popupItem));
-
-    drawer->open();
-    QVERIFY(drawer->isVisible());
-    QVERIFY(overlay->childItems().contains(popupItem));
-    QTRY_COMPARE(drawer->position(), qreal(1.0));
-
-    drawer->close();
-    QTRY_VERIFY(!drawer->isVisible());
-    QTRY_COMPARE(drawer->position(), qreal(0.0));
-    QVERIFY(!overlay->childItems().contains(popupItem));
-
-    drawer->setVisible(true);
-    QVERIFY(drawer->isVisible());
-    QVERIFY(overlay->childItems().contains(popupItem));
-    QTRY_COMPARE(drawer->position(), qreal(1.0));
-
-    drawer->setVisible(false);
-    QTRY_VERIFY(!drawer->isVisible());
-    QTRY_COMPARE(drawer->position(), qreal(0.0));
-    QTRY_VERIFY(!overlay->childItems().contains(popupItem));
-}
-
-void tst_QQuickDrawer::state()
-{
-    QQuickApplicationHelper helper(this, "applicationwindow.qml");
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-
-    QCOMPARE(drawer->isVisible(), false);
-
-    QSignalSpy visibleChangedSpy(drawer, SIGNAL(visibleChanged()));
-    QSignalSpy aboutToShowSpy(drawer, SIGNAL(aboutToShow()));
-    QSignalSpy aboutToHideSpy(drawer, SIGNAL(aboutToHide()));
-    QSignalSpy openedSpy(drawer, SIGNAL(opened()));
-    QSignalSpy closedSpy(drawer, SIGNAL(closed()));
-
-    QVERIFY(visibleChangedSpy.isValid());
-    QVERIFY(aboutToShowSpy.isValid());
-    QVERIFY(aboutToHideSpy.isValid());
-    QVERIFY(openedSpy.isValid());
-    QVERIFY(closedSpy.isValid());
-
-    int visibleChangedCount = 0;
-    int aboutToShowCount = 0;
-    int aboutToHideCount = 0;
-    int openedCount = 0;
-    int closedCount = 0;
-
-    // open programmatically...
-    drawer->open();
-    QCOMPARE(visibleChangedSpy.count(), ++visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), ++aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), aboutToHideCount);
-    QCOMPARE(openedSpy.count(), openedCount);
-    QCOMPARE(closedSpy.count(), closedCount);
-
-    // ...and wait until fully open
-    QVERIFY(openedSpy.wait());
-    QCOMPARE(visibleChangedSpy.count(), visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), aboutToHideCount);
-    QCOMPARE(openedSpy.count(), ++openedCount);
-    QCOMPARE(closedSpy.count(), closedCount);
-
-    // close programmatically...
-    drawer->close();
-    QCOMPARE(visibleChangedSpy.count(), visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), ++aboutToHideCount);
-    QCOMPARE(openedSpy.count(), openedCount);
-    QCOMPARE(closedSpy.count(), closedCount);
-
-    // ...and wait until fully closed
-    QVERIFY(closedSpy.wait());
-    QCOMPARE(visibleChangedSpy.count(), ++visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), aboutToHideCount);
-    QCOMPARE(openedSpy.count(), openedCount);
-    QCOMPARE(closedSpy.count(), ++closedCount);
-
-    // open interactively...
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(0, drawer->height() / 2));
-    QTest::mouseMove(window, QPoint(drawer->width() * 0.2, drawer->height() / 2), 16);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(drawer->width() * 0.8, drawer->height() / 2), 16);
-    QCOMPARE(visibleChangedSpy.count(), ++visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), ++aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), aboutToHideCount);
-    QCOMPARE(openedSpy.count(), openedCount);
-    QCOMPARE(closedSpy.count(), closedCount);
-
-    // ...and wait until fully open
-    QVERIFY(openedSpy.wait());
-    QCOMPARE(visibleChangedSpy.count(), visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), aboutToHideCount);
-    QCOMPARE(openedSpy.count(), ++openedCount);
-    QCOMPARE(closedSpy.count(), closedCount);
-
-    // close interactively...
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(drawer->width(), drawer->height() / 2));
-    QTest::mouseMove(window, QPoint(drawer->width() * 0.8, drawer->height() / 2), 16);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(drawer->width() * 0.2, drawer->height() / 2), 16);
-    QCOMPARE(visibleChangedSpy.count(), visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), ++aboutToHideCount);
-    QCOMPARE(openedSpy.count(), openedCount);
-    QCOMPARE(closedSpy.count(), closedCount);
-
-    // ...and wait until fully closed
-    QVERIFY(closedSpy.wait());
-    QCOMPARE(visibleChangedSpy.count(), ++visibleChangedCount);
-    QCOMPARE(aboutToShowSpy.count(), aboutToShowCount);
-    QCOMPARE(aboutToHideSpy.count(), aboutToHideCount);
-    QCOMPARE(openedSpy.count(), openedCount);
-    QCOMPARE(closedSpy.count(), ++closedCount);
-}
-
-void tst_QQuickDrawer::position_data()
-{
-    QTest::addColumn<Qt::Edge>("edge");
-    QTest::addColumn<QPoint>("press");
-    QTest::addColumn<QPoint>("from");
-    QTest::addColumn<QPoint>("to");
-    QTest::addColumn<qreal>("position");
-
-    QTest::newRow("top") << Qt::TopEdge << QPoint(100, 0) << QPoint(100, 50) << QPoint(100, 150) << qreal(0.5);
-    QTest::newRow("left") << Qt::LeftEdge << QPoint(0, 100) << QPoint(50, 100) << QPoint(150, 100) << qreal(0.5);
-    QTest::newRow("right") << Qt::RightEdge << QPoint(399, 100) << QPoint(350, 100) << QPoint(250, 100) << qreal(0.5);
-    QTest::newRow("bottom") << Qt::BottomEdge << QPoint(100, 399) << QPoint(100, 350) << QPoint(150, 250) << qreal(0.5);
-}
-
-void tst_QQuickDrawer::position()
-{
-    QFETCH(Qt::Edge, edge);
-    QFETCH(QPoint, press);
-    QFETCH(QPoint, from);
-    QFETCH(QPoint, to);
-    QFETCH(qreal, position);
-
-    QQuickApplicationHelper helper(this, QStringLiteral("applicationwindow.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = helper.appWindow->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-    drawer->setEdge(edge);
-
-    // Give it some time (50 ms) before the press to avoid flakiness on OpenSUSE: QTBUG-77946
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, press, 50);
-    QTest::mouseMove(window, from);
-    QTest::mouseMove(window, to);
-    QCOMPARE(drawer->position(), position);
-
-    // moved half-way open at almost infinite speed => snap to open
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, to);
-    QTRY_COMPARE(drawer->position(), 1.0);
-}
-
-void tst_QQuickDrawer::dragMargin_data()
-{
-    QTest::addColumn<Qt::Edge>("edge");
-    QTest::addColumn<qreal>("dragMargin");
-    QTest::addColumn<qreal>("dragFromLeft");
-    QTest::addColumn<qreal>("dragFromRight");
-
-    QTest::newRow("left:0") << Qt::LeftEdge << qreal(0) << qreal(0) << qreal(0);
-    QTest::newRow("left:-1") << Qt::LeftEdge << qreal(-1) << qreal(0) << qreal(0);
-    QTest::newRow("left:startDragDistance") << Qt::LeftEdge << qreal(QGuiApplication::styleHints()->startDragDistance()) << qreal(0.45) << qreal(0);
-    QTest::newRow("left:startDragDistance*2") << Qt::LeftEdge << qreal(QGuiApplication::styleHints()->startDragDistance() * 2) << qreal(0.45) << qreal(0);
-
-    QTest::newRow("right:0") << Qt::RightEdge << qreal(0) << qreal(0) << qreal(0);
-    QTest::newRow("right:-1") << Qt::RightEdge << qreal(-1) << qreal(0) << qreal(0);
-    QTest::newRow("right:startDragDistance") << Qt::RightEdge << qreal(QGuiApplication::styleHints()->startDragDistance()) << qreal(0) << qreal(0.75);
-    QTest::newRow("right:startDragDistance*2") << Qt::RightEdge << qreal(QGuiApplication::styleHints()->startDragDistance() * 2) << qreal(0) << qreal(0.75);
-}
-
-void tst_QQuickDrawer::dragMargin()
-{
-    QFETCH(Qt::Edge, edge);
-    QFETCH(qreal, dragMargin);
-    QFETCH(qreal, dragFromLeft);
-    QFETCH(qreal, dragFromRight);
-
-    QQuickApplicationHelper helper(this, QStringLiteral("applicationwindow.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = helper.appWindow->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-    drawer->setEdge(edge);
-    drawer->setDragMargin(dragMargin);
-
-    const int startDragDistance = qMax(20, QGuiApplication::styleHints()->startDragDistance() + 5) + 1;
-
-    // drag from the left
-    int leftX = qMax<int>(0, dragMargin);
-    int leftDistance = startDragDistance + drawer->width() * 0.45;
-    QVERIFY(leftDistance > QGuiApplication::styleHints()->startDragDistance());
-    // Give it some time (50 ms) before the press to avoid flakiness on OpenSUSE: QTBUG-77946
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(leftX, drawer->height() / 2), 50);
-    QTest::mouseMove(window, QPoint(leftX + startDragDistance, drawer->height() / 2));
-    QTest::mouseMove(window, QPoint(leftX + leftDistance, drawer->height() / 2));
-    QCOMPARE(drawer->position(), dragFromLeft);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(leftX + leftDistance, drawer->height() / 2));
-
-    drawer->close();
-    QTRY_COMPARE(drawer->position(), qreal(0.0));
-
-    // drag from the right
-    int rightX = qMin<int>(window->width() - 1, window->width() - dragMargin);
-    int rightDistance = startDragDistance + drawer->width() * 0.75;
-    QVERIFY(rightDistance > QGuiApplication::styleHints()->startDragDistance());
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(rightX, drawer->height() / 2));
-    QTest::mouseMove(window, QPoint(rightX - startDragDistance, drawer->height() / 2));
-    QTest::mouseMove(window, QPoint(rightX - rightDistance, drawer->height() / 2));
-    QCOMPARE(drawer->position(), dragFromRight);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(rightX - rightDistance, drawer->height() / 2));
-}
-
-static QRectF geometry(const QQuickItem *item)
-{
-    return QRectF(item->x(), item->y(), item->width(), item->height());
-}
-
-void tst_QQuickDrawer::reposition()
-{
-    QQuickApplicationHelper helper(this, QStringLiteral("reposition.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-    QQuickItem *popupItem = drawer->popupItem();
-    QVERIFY(popupItem);
-
-    drawer->open();
-    QQuickItem *dimmer = QQuickPopupPrivate::get(drawer)->dimmer;
-    QVERIFY(dimmer);
-
-    QCOMPARE(geometry(dimmer), QRectF(0, 0, window->width(), window->height()));
-    QTRY_COMPARE(geometry(popupItem), QRectF(0, 0, window->width() / 2, window->height()));
-
-    drawer->setY(100);
-    QCOMPARE(geometry(dimmer), QRectF(0, 100, window->width(), window->height() - 100));
-    QCOMPARE(geometry(popupItem), QRectF(0, 100, window->width() / 2, window->height() - 100));
-
-    drawer->setHeight(window->height());
-    QCOMPARE(geometry(dimmer), QRectF(0, 100, window->width(), window->height()));
-    QCOMPARE(geometry(popupItem), QRectF(0, 100, window->width() / 2, window->height()));
-
-    drawer->resetHeight();
-    QCOMPARE(geometry(dimmer), QRectF(0, 100, window->width(), window->height() - 100));
-    QCOMPARE(geometry(popupItem), QRectF(0, 100, window->width() / 2, window->height() - 100));
-
-    drawer->setParentItem(window->contentItem());
-    QCOMPARE(geometry(dimmer), QRectF(0, 150, window->width(), window->height() - 150));
-    QCOMPARE(geometry(popupItem), QRectF(0, 150, window->width() / 2, window->height() - 150));
-
-    drawer->setEdge(Qt::RightEdge);
-    QCOMPARE(geometry(dimmer), QRectF(0, 150, window->width(), window->height() - 150));
-    QTRY_COMPARE(geometry(popupItem), QRectF(window->width() - drawer->width(), 150, window->width() / 2, window->height() - 150));
-
-    window->setWidth(window->width() + 100);
-    QTRY_COMPARE(geometry(dimmer), QRectF(0, 150, window->width(), window->height() - 150));
-    QTRY_COMPARE(geometry(popupItem), QRectF(window->width() - drawer->width(), 150, window->width() / 2, window->height() - 150));
-
-    drawer->close();
-    QTRY_COMPARE(geometry(popupItem), QRectF(window->width(), 150, window->width() / 2, window->height() - 150));
-
-    QQuickDrawer *drawer2 = window->property("drawer2").value<QQuickDrawer *>();
-    QVERIFY(drawer2);
-    QQuickItem *popupItem2 = drawer2->popupItem();
-    QVERIFY(popupItem2);
-
-    drawer2->open();
-    QVERIFY(popupItem2->isVisible());
-    QCOMPARE(popupItem2->x(), -drawer2->width());
-    QTRY_COMPARE(popupItem2->x(), 0.0);
-}
-
-void tst_QQuickDrawer::header()
-{
-    QQuickApplicationHelper helper(this, QStringLiteral("header.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickApplicationWindow *window = helper.appWindow;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickItem *content = window->contentItem();
-    QVERIFY(content);
-
-    QQuickOverlay *overlay = QQuickOverlay::overlay(window);
-    QVERIFY(overlay);
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-    QQuickItem *popupItem = drawer->popupItem();
-
-    QQuickButton *button = window->property("button").value<QQuickButton*>();
-    QVERIFY(button);
-
-    drawer->open();
-    QVERIFY(drawer->isVisible());
-
-    QCOMPARE(drawer->parentItem(), overlay);
-    QCOMPARE(drawer->height(), overlay->height());
-    QCOMPARE(popupItem->height(), overlay->height());
-
-    drawer->setParentItem(content);
-    QCOMPARE(drawer->parentItem(), content);
-    QCOMPARE(drawer->height(), content->height());
-    QCOMPARE(popupItem->height(), content->height());
-
-    // must be possible to interact with the header when the drawer is below the header
-    QSignalSpy clickSpy(button, SIGNAL(clicked()));
-    QVERIFY(clickSpy.isValid());
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + button->width() / 2, button->y() + button->height() / 2));
-    QCOMPARE(clickSpy.count(), 1);
-}
-
-void tst_QQuickDrawer::hover_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<bool>("modal");
-
-    QTest::newRow("Window:modal") << "window-hover.qml" << true;
-    QTest::newRow("Window:modeless") << "window-hover.qml" << false;
-    QTest::newRow("ApplicationWindow:modal") << "applicationwindow-hover.qml" << true;
-    QTest::newRow("ApplicationWindow:modeless") << "applicationwindow-hover.qml" << false;
-}
-
-void tst_QQuickDrawer::hover()
-{
-    QFETCH(QString, source);
-    QFETCH(bool, modal);
-
-    QQuickApplicationHelper helper(this, source);
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-    drawer->setModal(modal);
-
-    QQuickControl *drawerItem = qobject_cast<QQuickControl *>(drawer->popupItem());
-    QVERIFY(drawerItem);
-    QVERIFY(drawerItem->isHoverEnabled());
-
-    QQuickButton *backgroundButton = window->property("backgroundButton").value<QQuickButton*>();
-    QVERIFY(backgroundButton);
-    backgroundButton->setHoverEnabled(true);
-
-    QQuickButton *drawerButton = window->property("drawerButton").value<QQuickButton*>();
-    QVERIFY(drawerButton);
-    drawerButton->setHoverEnabled(true);
-
-    QSignalSpy openedSpy(drawer, SIGNAL(opened()));
-    QVERIFY(openedSpy.isValid());
-    drawer->open();
-    QVERIFY(openedSpy.count() == 1 || openedSpy.wait());
-
-    // hover the background button outside the drawer
-    QTest::mouseMove(window, QPoint(window->width() - 1, window->height() - 1));
-    QCOMPARE(backgroundButton->isHovered(), !modal);
-    QVERIFY(!drawerButton->isHovered());
-    QVERIFY(!drawerItem->isHovered());
-
-    // hover the drawer background
-    QTest::mouseMove(window, QPoint(1, 1));
-    QVERIFY(!backgroundButton->isHovered());
-    QVERIFY(!drawerButton->isHovered());
-    QVERIFY(drawerItem->isHovered());
-
-    // hover the button in a drawer
-    QTest::mouseMove(window, QPoint(2, 2));
-    QVERIFY(!backgroundButton->isHovered());
-    QVERIFY(drawerButton->isHovered());
-    QVERIFY(!drawerItem->isHovered());
-
-    QSignalSpy closedSpy(drawer, SIGNAL(closed()));
-    QVERIFY(closedSpy.isValid());
-    drawer->close();
-    QVERIFY(closedSpy.count() == 1 || closedSpy.wait());
-
-    // hover the background button after closing the drawer
-    QTest::mouseMove(window, QPoint(window->width() / 2, window->height() / 2));
-    QVERIFY(backgroundButton->isHovered());
-    QVERIFY(!drawerButton->isHovered());
-    QVERIFY(!drawerItem->isHovered());
-}
-
-void tst_QQuickDrawer::wheel_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<bool>("modal");
-
-    QTest::newRow("Window:modal") << "window-wheel.qml" << true;
-    QTest::newRow("Window:modeless") << "window-wheel.qml" << false;
-    QTest::newRow("ApplicationWindow:modal") << "applicationwindow-wheel.qml" << true;
-    QTest::newRow("ApplicationWindow:modeless") << "applicationwindow-wheel.qml" << false;
-}
-
-static bool sendWheelEvent(QQuickItem *item, const QPoint &localPos, int degrees)
-{
-    QQuickWindow *window = item->window();
-    QWheelEvent wheelEvent(localPos, item->window()->mapToGlobal(localPos), QPoint(0, 0),
-                           QPoint(0, 8 * degrees), Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase,
-                           false);
-    QSpontaneKeyEvent::setSpontaneous(&wheelEvent);
-    return qGuiApp->notify(window, &wheelEvent);
-}
-
-void tst_QQuickDrawer::wheel()
-{
-    QFETCH(QString, source);
-    QFETCH(bool, modal);
-
-    QQuickApplicationHelper helper(this, source);
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickSlider *contentSlider = window->property("contentSlider").value<QQuickSlider*>();
-    QVERIFY(contentSlider);
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer && drawer->contentItem());
-    drawer->setModal(modal);
-
-    QQuickSlider *drawerSlider = window->property("drawerSlider").value<QQuickSlider*>();
-    QVERIFY(drawerSlider);
-
-    {
-        // wheel over the content
-        qreal oldContentValue = contentSlider->value();
-        qreal oldDrawerValue = drawerSlider->value();
-
-        QVERIFY(sendWheelEvent(contentSlider, QPoint(contentSlider->width() / 2, contentSlider->height() / 2), 15));
-
-        QVERIFY(!qFuzzyCompare(contentSlider->value(), oldContentValue)); // must have moved
-        QVERIFY(qFuzzyCompare(drawerSlider->value(), oldDrawerValue)); // must not have moved
-    }
-
-    QSignalSpy openedSpy(drawer, SIGNAL(opened()));
-    QVERIFY(openedSpy.isValid());
-    drawer->open();
-    QVERIFY(openedSpy.count() == 1 || openedSpy.wait());
-
-    {
-        // wheel over the drawer content
-        qreal oldContentValue = contentSlider->value();
-        qreal oldDrawerValue = drawerSlider->value();
-
-        QVERIFY(sendWheelEvent(drawerSlider, QPoint(drawerSlider->width() / 2, drawerSlider->height() / 2), 15));
-
-        QVERIFY(qFuzzyCompare(contentSlider->value(), oldContentValue)); // must not have moved
-        QVERIFY(!qFuzzyCompare(drawerSlider->value(), oldDrawerValue)); // must have moved
-    }
-
-    {
-        // wheel over the overlay
-        qreal oldContentValue = contentSlider->value();
-        qreal oldDrawerValue = drawerSlider->value();
-
-        QVERIFY(sendWheelEvent(QQuickOverlay::overlay(window), QPoint(0, 0), 15));
-
-        if (modal) {
-            // the content below a modal overlay must not move
-            QVERIFY(qFuzzyCompare(contentSlider->value(), oldContentValue));
-        } else {
-            // the content below a modeless overlay must move
-            QVERIFY(!qFuzzyCompare(contentSlider->value(), oldContentValue));
-        }
-        QVERIFY(qFuzzyCompare(drawerSlider->value(), oldDrawerValue)); // must not have moved
-    }
-}
-
-void tst_QQuickDrawer::multiple()
-{
-    QQuickApplicationHelper helper(this, QStringLiteral("multiple.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *leftDrawer = window->property("leftDrawer").value<QQuickDrawer*>();
-    QVERIFY(leftDrawer);
-    QQuickButton *leftButton = window->property("leftButton").value<QQuickButton*>();
-    QVERIFY(leftButton);
-    QSignalSpy leftClickSpy(leftButton, SIGNAL(clicked()));
-    QVERIFY(leftClickSpy.isValid());
-
-    QQuickDrawer *rightDrawer = window->property("rightDrawer").value<QQuickDrawer*>();
-    QVERIFY(rightDrawer);
-    QQuickButton *rightButton = window->property("rightButton").value<QQuickButton*>();
-    QVERIFY(rightButton);
-    QSignalSpy rightClickSpy(rightButton, SIGNAL(clicked()));
-    QVERIFY(rightClickSpy.isValid());
-
-    QQuickButton *contentButton = window->property("contentButton").value<QQuickButton*>();
-    QVERIFY(contentButton);
-    QSignalSpy contentClickSpy(contentButton, SIGNAL(clicked()));
-    QVERIFY(contentClickSpy.isValid());
-
-    // no drawers open, click the content
-    QTest::mouseClick(window, Qt::LeftButton);
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 0);
-    QCOMPARE(rightClickSpy.count(), 0);
-
-    // drag the left drawer open
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(0, window->height() / 2));
-    QTest::mouseMove(window, QPoint(leftDrawer->width() / 4, window->height() / 2));
-    QTest::mouseMove(window, QPoint(leftDrawer->width() / 4 * 3, window->height() / 2));
-    QCOMPARE(leftDrawer->position(), 0.5);
-    QCOMPARE(rightDrawer->position(), 0.0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(leftDrawer->width() / 2, window->height() / 2));
-    QTRY_COMPARE(leftDrawer->position(), 1.0);
-    QCOMPARE(rightDrawer->position(), 0.0);
-
-    // cannot drag the right drawer while the left drawer is open
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() / 2));
-    QTest::mouseMove(window, QPoint(window->width() - leftDrawer->width() / 2, window->height() / 2));
-    QCOMPARE(leftDrawer->position(), 1.0);
-    QCOMPARE(rightDrawer->position(), 0.0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - leftDrawer->width() / 2, window->height() / 2));
-    QCOMPARE(rightDrawer->position(), 0.0);
-    QCOMPARE(leftDrawer->position(), 1.0);
-
-    // open the right drawer below the left drawer
-    rightDrawer->open();
-    QTRY_COMPARE(rightDrawer->position(), 1.0);
-
-    // click the left drawer's button
-    QTest::mouseClick(window, Qt::LeftButton);
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 0);
-
-    // click the left drawer's background (button disabled, don't leak through to the right drawer below)
-    leftButton->setEnabled(false);
-    QTest::mouseClick(window, Qt::LeftButton);
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 0);
-    leftButton->setEnabled(true);
-
-    // click the overlay of the left drawer (don't leak through to right drawer below)
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - (window->width() - leftDrawer->width()) / 2, window->height() / 2));
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 0);
-    QTRY_VERIFY(!leftDrawer->isVisible());
-
-    // click the right drawer's button
-    QTest::mouseClick(window, Qt::LeftButton);
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 1);
-
-    // cannot drag the left drawer while the right drawer is open
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(0, window->height() / 2));
-    QTest::mouseMove(window, QPoint(leftDrawer->width() / 2, window->height() / 2));
-    QCOMPARE(leftDrawer->position(), 0.0);
-    QCOMPARE(rightDrawer->position(), 1.0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(leftDrawer->width() / 2, window->height() / 2));
-    QCOMPARE(leftDrawer->position(), 0.0);
-    QCOMPARE(rightDrawer->position(), 1.0);
-
-    // click the right drawer's background (button disabled, don't leak through to the content below)
-    rightButton->setEnabled(false);
-    QTest::mouseClick(window, Qt::LeftButton);
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 1);
-    rightButton->setEnabled(true);
-
-    // click the overlay of the right drawer (don't leak through to the content below)
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint((window->width() - rightDrawer->width()) / 2, window->height() / 2));
-    QCOMPARE(contentClickSpy.count(), 1);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 1);
-    QTRY_VERIFY(!rightDrawer->isVisible());
-
-    // no drawers open, click the content
-    QTest::mouseClick(window, Qt::LeftButton);
-    QCOMPARE(contentClickSpy.count(), 2);
-    QCOMPARE(leftClickSpy.count(), 1);
-    QCOMPARE(rightClickSpy.count(), 1);
-
-    // drag the right drawer open
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() / 2));
-    QTest::mouseMove(window, QPoint(window->width() - rightDrawer->width() / 4, window->height() / 2));
-    QTest::mouseMove(window, QPoint(window->width() - rightDrawer->width() / 4 * 3, window->height() / 2));
-    QCOMPARE(rightDrawer->position(), 0.5);
-    QCOMPARE(leftDrawer->position(), 0.0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - rightDrawer->width() / 2, window->height() / 2));
-    QTRY_COMPARE(rightDrawer->position(), 1.0);
-    QCOMPARE(leftDrawer->position(), 0.0);
-}
-
-void tst_QQuickDrawer::touch_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::addColumn<QPoint>("from");
-    QTest::addColumn<QPoint>("to");
-
-    QTest::newRow("Window:inside") << "window.qml" << QPoint(150, 100) << QPoint(50, 100);
-    QTest::newRow("Window:outside") << "window.qml" << QPoint(300, 100) << QPoint(100, 100);
-    QTest::newRow("ApplicationWindow:inside") << "applicationwindow.qml" << QPoint(150, 100) << QPoint(50, 100);
-    QTest::newRow("ApplicationWindow:outside") << "applicationwindow.qml" << QPoint(300, 100) << QPoint(100, 100);
-
-    QTest::newRow("Window+Button:inside") << "window-button.qml" << QPoint(150, 100) << QPoint(50, 100);
-    QTest::newRow("Window+Button:outside") << "window-button.qml" << QPoint(300, 100) << QPoint(100, 100);
-    QTest::newRow("ApplicationWindow+Button:inside") << "applicationwindow-button.qml" << QPoint(150, 100) << QPoint(50, 100);
-    QTest::newRow("ApplicationWindow+Button:outside") << "applicationwindow-button.qml" << QPoint(300, 100) << QPoint(100, 100);
-}
-
-void tst_QQuickDrawer::touch()
-{
-    QFETCH(QString, source);
-    QFETCH(QPoint, from);
-    QFETCH(QPoint, to);
-
-    QQuickApplicationHelper helper(this, source);
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-
-    QSignalSpy drawerOpenedSpy(drawer, SIGNAL(opened()));
-    QSignalSpy drawerClosedSpy(drawer, SIGNAL(closed()));
-    QVERIFY(drawerOpenedSpy.isValid());
-    QVERIFY(drawerClosedSpy.isValid());
-
-    // drag to open
-    QTest::touchEvent(window, touchDevice.data()).press(0, QPoint(0, 100));
-    QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(50, 100));
-    QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(150, 100));
-    QTest::touchEvent(window, touchDevice.data()).release(0, QPoint(150, 100));
-    QVERIFY(drawerOpenedSpy.wait());
-    QCOMPARE(drawer->position(), 1.0);
-
-    // drag to close
-    QTest::touchEvent(window, touchDevice.data()).press(0, from);
-    for (int x = from.x(); x > to.x(); x -= 10)
-        QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(x, to.y()));
-    QTest::touchEvent(window, touchDevice.data()).move(0, to);
-    QTest::touchEvent(window, touchDevice.data()).release(0, to);
-    QVERIFY(drawerClosedSpy.wait());
-    QCOMPARE(drawer->position(), 0.0);
-}
-
-void tst_QQuickDrawer::multiTouch()
-{
-    QQuickApplicationHelper helper(this, QStringLiteral("multiTouch.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickOverlay *overlay = QQuickOverlay::overlay(window);
-    QVERIFY(overlay);
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    QQuickPopup *popup = window->property("popup").value<QQuickPopup *>();
-    QVERIFY(popup);
-
-    QQuickButton *button = window->property("button").value<QQuickButton *>();
-    QVERIFY(button);
-
-    QSignalSpy overlayPressedSpy(overlay, SIGNAL(pressed()));
-    QSignalSpy overlayReleasedSpy(overlay, SIGNAL(released()));
-    QVERIFY(overlayPressedSpy.isValid());
-    QVERIFY(overlayReleasedSpy.isValid());
-
-    QSignalSpy drawerOpenedSpy(drawer, SIGNAL(opened()));
-    QVERIFY(drawerOpenedSpy.isValid());
-
-    QSignalSpy buttonPressedSpy(button, SIGNAL(pressed()));
-    QSignalSpy buttonReleasedSpy(button, SIGNAL(released()));
-    QVERIFY(buttonPressedSpy.isValid());
-    QVERIFY(buttonReleasedSpy.isValid());
-
-    popup->open();
-    QVERIFY(popup->isVisible());
-
-    drawer->open();
-    QVERIFY(drawer->isVisible());
-    QVERIFY(drawerOpenedSpy.wait());
-
-    // 1st press
-    QTest::touchEvent(window, touchDevice.data()).press(0, QPoint(300, 100));
-    QVERIFY(popup->isVisible());
-    QVERIFY(drawer->isVisible());
-    QCOMPARE(buttonPressedSpy.count(), 0);
-    QCOMPARE(overlayPressedSpy.count(), 1);
-
-    // 2nd press (blocked & ignored)
-    QTest::touchEvent(window, touchDevice.data()).stationary(0).press(1, QPoint(300, 200));
-    QVERIFY(popup->isVisible());
-    QVERIFY(drawer->isVisible());
-    QCOMPARE(buttonPressedSpy.count(), 0);
-    QCOMPARE(overlayPressedSpy.count(), 2);
-
-    // 2nd release (blocked & ignored)
-    QTest::touchEvent(window, touchDevice.data()).stationary(0).release(1, QPoint(300, 200));
-    QVERIFY(popup->isVisible());
-    QVERIFY(drawer->isVisible());
-    QCOMPARE(buttonPressedSpy.count(), 0);
-    QCOMPARE(buttonReleasedSpy.count(), 0);
-    QCOMPARE(overlayPressedSpy.count(), 2);
-    QCOMPARE(overlayReleasedSpy.count(), 1);
-
-    // 1st release
-    QTest::touchEvent(window, touchDevice.data()).release(0, QPoint(300, 100));
-    QVERIFY(popup->isVisible());
-    QTRY_VERIFY(!drawer->isVisible());
-    QCOMPARE(buttonPressedSpy.count(), 0);
-    QCOMPARE(buttonReleasedSpy.count(), 0);
-    QCOMPARE(overlayPressedSpy.count(), 2);
-    QCOMPARE(overlayReleasedSpy.count(), 2);
-
-    drawer->open();
-    QVERIFY(drawer->isVisible());
-    QVERIFY(drawerOpenedSpy.wait());
-
-    // 1st drag
-    QTest::touchEvent(window, touchDevice.data()).press(0, QPoint(300, 100));
-    QCOMPARE(buttonPressedSpy.count(), 0);
-    QCOMPARE(overlayPressedSpy.count(), 3);
-    for (int x = 300; x >= 100; x -= 10) {
-        QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(x, 100));
-        QVERIFY(popup->isVisible());
-        QVERIFY(drawer->isVisible());
-    }
-    QCOMPARE(drawer->position(), 0.5);
-
-    // 2nd drag (blocked & ignored)
-    QTest::touchEvent(window, touchDevice.data()).stationary(0).press(1, QPoint(300, 200));
-    QCOMPARE(buttonPressedSpy.count(), 0);
-    QCOMPARE(overlayPressedSpy.count(), 4);
-    for (int x = 300; x >= 0; x -= 10) {
-        QTest::touchEvent(window, touchDevice.data()).stationary(0).move(1, QPoint(x, 200));
-        QVERIFY(popup->isVisible());
-        QVERIFY(drawer->isVisible());
-    }
-    QCOMPARE(drawer->position(), 0.5);
-
-    // 2nd release (blocked & ignored)
-    QTest::touchEvent(window, touchDevice.data()).stationary(0).release(1, QPoint(300, 0));
-    QVERIFY(popup->isVisible());
-    QVERIFY(drawer->isVisible());
-    QCOMPARE(drawer->position(), 0.5);
-    QCOMPARE(buttonReleasedSpy.count(), 0);
-    QCOMPARE(overlayReleasedSpy.count(), 3);
-
-    // 1st release
-    QTest::touchEvent(window, touchDevice.data()).release(0, QPoint(300, 100));
-    QVERIFY(popup->isVisible());
-    QTRY_VERIFY(!drawer->isVisible());
-    QCOMPARE(buttonReleasedSpy.count(), 0);
-    QCOMPARE(overlayReleasedSpy.count(), 4);
-}
-
-void tst_QQuickDrawer::grabber()
-{
-    QQuickApplicationHelper helper(this, QStringLiteral("grabber.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    QSignalSpy drawerOpenedSpy(drawer, SIGNAL(opened()));
-    QSignalSpy drawerClosedSpy(drawer, SIGNAL(closed()));
-    QVERIFY(drawerOpenedSpy.isValid());
-    QVERIFY(drawerClosedSpy.isValid());
-
-    drawer->open();
-    QVERIFY(drawerOpenedSpy.wait());
-
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(300, 100));
-    QVERIFY(drawerClosedSpy.wait());
-
-    QQuickPopup *popup = window->property("popup").value<QQuickPopup *>();
-    QVERIFY(popup);
-
-    QSignalSpy popupOpenedSpy(popup, SIGNAL(opened()));
-    QSignalSpy popupClosedSpy(popup, SIGNAL(closed()));
-    QVERIFY(popupOpenedSpy.isValid());
-    QVERIFY(popupClosedSpy.isValid());
-
-    popup->open();
-    QTRY_COMPARE(popupOpenedSpy.count(), 1);
-
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(100, 300));
-    QTRY_COMPARE(popupClosedSpy.count(), 1);
-}
-
-void tst_QQuickDrawer::interactive_data()
-{
-    QTest::addColumn<QString>("source");
-    QTest::newRow("Window") << "window.qml";
-    QTest::newRow("ApplicationWindow") << "applicationwindow.qml";
-}
-
-void tst_QQuickDrawer::interactive()
-{
-    QFETCH(QString, source);
-    QQuickApplicationHelper helper(this, source);
-    QVERIFY2(helper.ready, helper.failureMessage());
-
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>();
-    QVERIFY(drawer);
-
-    drawer->setInteractive(false);
-
-    QSignalSpy openedSpy(drawer, SIGNAL(opened()));
-    QSignalSpy aboutToHideSpy(drawer, SIGNAL(aboutToHide()));
-    QVERIFY(openedSpy.isValid());
-    QVERIFY(aboutToHideSpy.isValid());
-
-    drawer->open();
-    QVERIFY(openedSpy.wait());
-
-    // click outside
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(300, 100));
-    QCOMPARE(aboutToHideSpy.count(), 0);
-
-    // drag inside
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(drawer->width(), 0));
-    QTest::mouseMove(window, QPoint(0, 0));
-    QCOMPARE(drawer->position(), 1.0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(0, 0));
-    QCOMPARE(drawer->position(), 1.0);
-    QCOMPARE(aboutToHideSpy.count(), 0);
-
-    // drag outside
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, 0));
-    QTest::mouseMove(window, QPoint(0, 0));
-    QCOMPARE(drawer->position(), 1.0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(0, 0));
-    QCOMPARE(drawer->position(), 1.0);
-    QCOMPARE(aboutToHideSpy.count(), 0);
-
-    // close on escape
-    QTest::keyClick(window, Qt::Key_Escape);
-    QCOMPARE(aboutToHideSpy.count(), 0);
-}
-
-void tst_QQuickDrawer::flickable_data()
-{
-    QTest::addColumn<bool>("mouse");
-    QTest::addColumn<QPoint>("from");
-    QTest::addColumn<QPoint>("to");
-
-    QTest::newRow("mouse,straight") << true << QPoint(200, 200) << QPoint(200, 100);
-    QTest::newRow("mouse,diagonal") << true << QPoint(200, 200) << QPoint(250, 100);
-    QTest::newRow("touch,straight") << false << QPoint(200, 200) << QPoint(200, 100);
-    QTest::newRow("touch,diagonal") << false << QPoint(200, 200) << QPoint(250, 100);
-}
-
-void tst_QQuickDrawer::flickable()
-{
-    QFETCH(bool, mouse);
-    QFETCH(QPoint, from);
-    QFETCH(QPoint, to);
-
-    QQuickApplicationHelper helper(this, QStringLiteral("flickable.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    QQuickFlickable *flickable = window->property("flickable").value<QQuickFlickable *>();
-    QVERIFY(flickable);
-
-    QSignalSpy drawerOpenedSpy(drawer, SIGNAL(opened()));
-    QVERIFY(drawerOpenedSpy.isValid());
-
-    drawer->open();
-    QVERIFY(drawerOpenedSpy.wait());
-
-    if (mouse)
-        QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, from);
-    else
-        QTest::touchEvent(window, touchDevice.data()).press(0, from);
-
-    static const int steps = 10;
-    for (int i = 0; i < steps; ++i) {
-        int x = i * qAbs(from.x() - to.x()) / steps;
-        int y = i * qAbs(from.y() - to.y()) / steps;
-
-        if (mouse)
-            QTest::mouseMove(window, QPoint(x, y));
-        else
-            QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(x, y));
-        QTest::qWait(1); // avoid infinite velocity
-    }
-
-    QVERIFY(flickable->isDragging());
-
-    if (mouse)
-        QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, to);
-    else
-        QTest::touchEvent(window, touchDevice.data()).release(0, to);
-
-    QVERIFY(!flickable->isDragging());
-}
-
-void tst_QQuickDrawer::dragOverModalShadow_data()
-{
-    QTest::addColumn<bool>("mouse");
-    QTest::newRow("mouse") << true;
-    QTest::newRow("touch") << false;
-}
-
-// QTBUG-60602
-void tst_QQuickDrawer::dragOverModalShadow()
-{
-    QFETCH(bool, mouse);
-
-    QQuickApplicationHelper helper(this, QStringLiteral("dragOverModalShadow.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    QQuickPopup *popup = window->property("popup").value<QQuickPopup *>();
-    QVERIFY(popup);
-
-    popup->open();
-    QVERIFY(popup->isVisible());
-    QVERIFY(!drawer->isVisible());
-
-    const QPoint from(popup->x(), popup->y() + popup->height() + 5);
-    const QPoint to(popup->x() + popup->width(), popup->y() + popup->height() + 5);
-
-    if (mouse)
-        QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, from);
-    else
-        QTest::touchEvent(window, touchDevice.data()).press(0, from);
-    QVERIFY(!drawer->isVisible());
-
-    static const int steps = 10;
-    for (int i = 0; i < steps; ++i) {
-        int x = from.x() + i * qAbs(from.x() - to.x()) / steps;
-        int y = from.y() + i * qAbs(from.y() - to.y()) / steps;
-
-        if (mouse)
-            QTest::mouseMove(window, QPoint(x, y));
-        else
-            QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(x, y));
-        QTest::qWait(1); // avoid infinite velocity
-        QVERIFY(!drawer->isVisible());
-    }
-
-    if (mouse)
-        QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, to);
-    else
-        QTest::touchEvent(window, touchDevice.data()).release(0, to);
-    QVERIFY(!drawer->isVisible());
-}
-
-void tst_QQuickDrawer::nonModal_data()
-{
-    QTest::addColumn<bool>("mouse");
-    QTest::newRow("mouse") << true;
-    QTest::newRow("touch") << false;
-}
-
-// QTBUG-59652
-void tst_QQuickDrawer::nonModal()
-{
-    QFETCH(bool, mouse);
-
-    QQuickApplicationHelper helper(this, QStringLiteral("window.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-    drawer->setModal(false);
-
-    const QPoint from(1, 1);
-    const QPoint to(150, 1);
-
-    // drag to open
-    QSignalSpy openedSpy(drawer, SIGNAL(opened()));
-    QVERIFY(openedSpy.isValid());
-
-    if (mouse)
-        QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, from);
-    else
-        QTest::touchEvent(window, touchDevice.data()).press(0, from);
-
-    static const int steps = 10;
-    for (int i = 0; i < steps; ++i) {
-        int x = i * qAbs(from.x() - to.x()) / steps;
-        int y = i * qAbs(from.y() - to.y()) / steps;
-
-        if (mouse)
-            QTest::mouseMove(window, QPoint(x, y));
-        else
-            QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(x, y));
-        QTest::qWait(1); // avoid infinite velocity
-    }
-    QVERIFY(drawer->isVisible());
-
-    if (mouse)
-        QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, to);
-    else
-        QTest::touchEvent(window, touchDevice.data()).release(0, to);
-    QVERIFY(openedSpy.wait());
-
-    // drag to close
-    QSignalSpy closedSpy(drawer, SIGNAL(closed()));
-    QVERIFY(closedSpy.isValid());
-
-    if (mouse)
-        QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, to);
-    else
-        QTest::touchEvent(window, touchDevice.data()).press(0, to);
-
-    for (int i = steps - 1; i >= 0; --i) {
-        int x = i * qAbs(from.x() - to.x()) / steps;
-        int y = i * qAbs(from.y() - to.y()) / steps;
-
-        if (mouse)
-            QTest::mouseMove(window, QPoint(x, y));
-        else
-            QTest::touchEvent(window, touchDevice.data()).move(0, QPoint(x, y));
-        QTest::qWait(1); // avoid infinite velocity
-    }
-    QVERIFY(drawer->isVisible());
-
-    if (mouse)
-        QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, from);
-    else
-        QTest::touchEvent(window, touchDevice.data()).release(0, from);
-    QVERIFY(closedSpy.wait());
-}
-
-void tst_QQuickDrawer::slider_data()
-{
-    QTest::addColumn<bool>("mouse");
-    QTest::addColumn<int>("delta");
-
-    QTest::newRow("mouse") << true << 2;
-    QTest::newRow("touch") << false << 2;
-    QTest::newRow("mouse,delta") << true << 296 / 8;
-}
-
-void tst_QQuickDrawer::slider()
-{
-    QFETCH(bool, mouse);
-    QFETCH(int, delta);
-
-    QQuickApplicationHelper helper(this, QStringLiteral("slider.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    QQuickSlider *slider = window->property("slider").value<QQuickSlider *>();
-    QVERIFY(slider);
-
-    QCOMPARE(slider->value(), 1.0);
-    QCOMPARE(drawer->position(), 1.0);
-
-    const qreal y = slider->height() / 2;
-    const QPoint from(slider->width() - 1, y);
-    const QPoint to(1, y);
-
-    QTest::qWait(1);
-
-    if (mouse)
-        QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, from);
-    else
-        QTest::touchEvent(window, touchDevice.data()).press(0, from);
-
-    QTest::qWait(1);
-
-    int distance = qAbs(from.x() - to.x());
-    for (int dx = delta; dx <= distance; dx += delta) {
-        if (mouse)
-            QTest::mouseMove(window, from - QPoint(dx, 0));
-        else
-            QTest::touchEvent(window, touchDevice.data()).move(0, from - QPoint(dx, 0));
-        QTest::qWait(1); // avoid infinite velocity
-    }
-
-    QCOMPARE(slider->value(), 0.0);
-    QCOMPARE(drawer->position(), 1.0);
-
-    if (mouse)
-        QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, to);
-    else
-        QTest::touchEvent(window, touchDevice.data()).release(0, to);
-}
-
-void tst_QQuickDrawer::topEdgeScreenEdge()
-{
-    QQuickApplicationHelper helper(this, QStringLiteral("topEdgeScreenEdge.qml"));
-    QVERIFY2(helper.ready, helper.failureMessage());
-    QQuickWindow *window = helper.window;
-    window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window));
-
-    QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer *>();
-    QVERIFY(drawer);
-
-    QVERIFY(QMetaObject::invokeMethod(drawer, "open"));
-    QTRY_COMPARE(drawer->position(), 1.0);
-}
-
-QTEST_QUICKCONTROLS_MAIN(tst_QQuickDrawer)
-
-#include "tst_qquickdrawer.moc"