Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105

26 files changed, 620 insertions, 18 deletions

diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST b/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST
index 62aa19a9ae..20f989fc50 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST
@@ -2,3 +2,5 @@
 windows gcc
 [touchDragFlickableBehindSlider]
 windows gcc
+[touchDragFlickableBehindButton]
+windows gcc
diff --git a/tests/auto/quick/pointerhandlers/pointerhandlers.pro b/tests/auto/quick/pointerhandlers/pointerhandlers.pro
index 950d6835eb..4d6311bdb2 100644
--- a/tests/auto/quick/pointerhandlers/pointerhandlers.pro
+++ b/tests/auto/quick/pointerhandlers/pointerhandlers.pro
@@ -10,4 +10,5 @@ qtConfig(private_tests) {
         qquickpointerhandler \
         qquickpointhandler \
         qquicktaphandler \
+        qquickwheelhandler \
 }
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml
new file mode 100644
index 0000000000..49e44f2b1f
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.14
+
+Rectangle {
+    width: 320; height: 240
+    color: "lightsteelblue"; antialiasing: true
+    border.color: outerWheelHandler.active ? "red" : "white"
+
+    WheelHandler {
+        id: outerWheelHandler
+        objectName: "outerWheelHandler"
+        property: "x"
+    }
+
+    Rectangle {
+        width: 120; height: 120; x: 100; y: 60
+        color: "beige"; antialiasing: true
+        border.color: innerWheelHandler.active ? "red" : "white"
+
+        WheelHandler {
+            id: innerWheelHandler
+            objectName: "innerWheelHandler"
+            // TODO should ideally deactivate because events go to the outer handler, not because of timeout
+            activeTimeout: 0.5
+            property: "x"
+        }
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml
new file mode 100644
index 0000000000..d4875d5313
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.14
+
+Rectangle {
+    width: 320; height: 240
+    color: "green"; antialiasing: true
+
+    Rectangle {
+        width: 100; height: 2; anchors.centerIn: parent
+        Rectangle {
+            width: 2; height: 100; anchors.centerIn: parent
+        }
+    }
+
+    WheelHandler {
+        activeTimeout: 0.5
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/qquickwheelhandler.pro b/tests/auto/quick/pointerhandlers/qquickwheelhandler/qquickwheelhandler.pro
new file mode 100644
index 0000000000..7509e38dd3
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/qquickwheelhandler.pro
@@ -0,0 +1,14 @@
+CONFIG += testcase
+TARGET = tst_qquickwheelhandler
+macos:CONFIG -= app_bundle
+
+SOURCES += tst_qquickwheelhandler.cpp
+OTHER_FILES = \
+    data/rectWheel.qml \
+
+include (../../../shared/util.pri)
+include (../../shared/util.pri)
+
+TESTDATA = data/*
+
+QT += core-private gui-private qml-private quick-private testlib
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/tst_qquickwheelhandler.cpp b/tests/auto/quick/pointerhandlers/qquickwheelhandler/tst_qquickwheelhandler.cpp
new file mode 100644
index 0000000000..2abf2ea8c3
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/tst_qquickwheelhandler.cpp
@@ -0,0 +1,344 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtTest/QSignalSpy>
+#include <QtGui/QStyleHints>
+#include <qpa/qwindowsysteminterface.h>
+#include <private/qquickwheelhandler_p.h>
+#include <QtQuick/private/qquickrectangle_p.h>
+#include <QtQuick/qquickview.h>
+#include <QtQml/qqmlcontext.h>
+#include "../../../shared/util.h"
+#include "../../shared/viewtestutil.h"
+
+Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests")
+
+class tst_QQuickWheelHandler: public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_QQuickWheelHandler() { }
+
+private slots:
+    void singleHandler_data();
+    void singleHandler();
+    void nestedHandler_data();
+    void nestedHandler();
+
+private:
+    void sendWheelEvent(QQuickView &window, QPoint pos, QPoint angleDelta,
+                        QPoint pixelDelta = QPoint(), Qt::KeyboardModifiers modifiers = Qt::NoModifier,
+                        Qt::ScrollPhase phase = Qt::NoScrollPhase, bool inverted = false);
+};
+
+void tst_QQuickWheelHandler::sendWheelEvent(QQuickView &window, QPoint pos, QPoint angleDelta,
+                                            QPoint pixelDelta, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, bool inverted)
+{
+    QWheelEvent wheelEvent(pos, window.mapToGlobal(pos), pixelDelta, angleDelta,
+                           Qt::NoButton, modifiers, phase, inverted);
+    QGuiApplication::sendEvent(&window, &wheelEvent);
+    qApp->processEvents();
+}
+
+void tst_QQuickWheelHandler::singleHandler_data()
+{
+    // handler properties
+    QTest::addColumn<Qt::Orientation>("orientation");
+    QTest::addColumn<bool>("invertible");
+    QTest::addColumn<int>("rotationScale");
+    QTest::addColumn<QString>("property");
+    QTest::addColumn<qreal>("targetScaleMultiplier");
+    QTest::addColumn<bool>("targetTransformAroundCursor");
+    // event
+    QTest::addColumn<QPoint>("eventPos");
+    QTest::addColumn<QPoint>("eventAngleDelta");
+    QTest::addColumn<QPoint>("eventPixelDelta");
+    QTest::addColumn<Qt::KeyboardModifiers>("eventModifiers");
+    QTest::addColumn<bool>("eventPhases");
+    QTest::addColumn<bool>("eventInverted");
+    // result
+    QTest::addColumn<QPoint>("expectedPosition");
+    QTest::addColumn<qreal>("expectedScale");
+    QTest::addColumn<int>("expectedRotation");
+
+    // move the item
+    QTest::newRow("vertical wheel angle delta to adjust x")
+            << Qt::Vertical << false << 1 << "x" << 1.5 << true
+            << QPoint(160, 120) << QPoint(-360, 120) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(15, 0) << 1.0 << 0;
+    QTest::newRow("horizontal wheel angle delta to adjust y")
+            << Qt::Horizontal << false << 1 << "y" << 1.5 << false
+            << QPoint(160, 120) << QPoint(-360, 120) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(0, -45) << 1.0 << 0;
+    QTest::newRow("vertical wheel angle delta to adjust y, amplified and inverted")
+            << Qt::Vertical << true << 4 << "y" << 1.5 << true
+            << QPoint(160, 120) << QPoint(60, 60) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << true
+            << QPoint(0, 30) << 1.0 << 0;
+    QTest::newRow("horizontal wheel angle delta to adjust x, amplified and reversed")
+            << Qt::Horizontal << false << -4 << "x" << 1.5 << false
+            << QPoint(160, 120) << QPoint(60, 60) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(-30, 0) << 1.0 << 0;
+    QTest::newRow("vertical wheel pixel delta to adjust x")
+            << Qt::Vertical << false << 1 << "x" << 1.5 << true
+            << QPoint(160, 120) << QPoint(-360, 120) << QPoint(20, 20) << Qt::KeyboardModifiers(Qt::NoModifier) << true << false
+            << QPoint(20, 0) << 1.0 << 0;
+    QTest::newRow("horizontal wheel pixel delta to adjust y")
+            << Qt::Horizontal << false << 1 << "y" << 1.5 << false
+            << QPoint(160, 120) << QPoint(-360, 120) << QPoint(20, 20) << Qt::KeyboardModifiers(Qt::NoModifier) << true << false
+            << QPoint(0, 20) << 1.0 << 0;
+    QTest::newRow("vertical wheel pixel delta to adjust y, amplified and inverted")
+            << Qt::Vertical << true << 4 << "y" << 1.5 << true
+            << QPoint(160, 120) << QPoint(60, 60) << QPoint(20, 20) << Qt::KeyboardModifiers(Qt::NoModifier) << true << true
+            << QPoint(0, 80) << 1.0 << 0;
+    QTest::newRow("horizontal wheel pixel delta to adjust x, amplified and reversed")
+            << Qt::Horizontal << false << -4 << "x" << 1.5 << false
+            << QPoint(160, 120) << QPoint(60, 60) << QPoint(20, 20) << Qt::KeyboardModifiers(Qt::NoModifier) << true << false
+            << QPoint(-80, 0) << 1.0 << 0;
+
+    // scale the item
+    QTest::newRow("vertical wheel angle delta to adjust scale")
+            << Qt::Vertical << false << 1 << "scale" << 1.5 << true
+            << QPoint(50, 32) << QPoint(360, 120) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(55, 44) << 1.5 << 0;
+    QTest::newRow("horizontal wheel angle delta to adjust scale, amplified and reversed, don't adjust position")
+            << Qt::Horizontal << false << -2 << "scale" << 1.5 << false
+            << QPoint(50, 32) << QPoint(-240, 360) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(0, 0) << 5.0625 << 0;
+
+    // rotate the item
+    QTest::newRow("vertical wheel angle delta to adjust rotation")
+            << Qt::Vertical << false << 1 << "rotation" << 1.5 << true
+            << QPoint(50, 32) << QPoint(360, -120) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(19, -31) << 1.0 << -15;
+    QTest::newRow("horizontal wheel angle delta to adjust rotation, amplified and reversed, don't adjust position")
+            << Qt::Horizontal << false << -2 << "rotation" << 1.5 << false
+            << QPoint(80, 80) << QPoint(240, 360) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false
+            << QPoint(0, 0) << 1.0 << -60;
+}
+
+void tst_QQuickWheelHandler::singleHandler()
+{
+    // handler properties
+    QFETCH(Qt::Orientation, orientation);
+    QFETCH(bool, invertible);
+    QFETCH(int, rotationScale);
+    QFETCH(QString, property);
+    QFETCH(qreal, targetScaleMultiplier);
+    QFETCH(bool, targetTransformAroundCursor);
+    // event
+    QFETCH(QPoint, eventPos);
+    QFETCH(QPoint, eventAngleDelta);
+    QFETCH(QPoint, eventPixelDelta);
+    QFETCH(Qt::KeyboardModifiers, eventModifiers);
+    QFETCH(bool, eventPhases);
+    QFETCH(bool, eventInverted);
+    // result
+    QFETCH(QPoint, expectedPosition);
+    QFETCH(qreal, expectedScale);
+    QFETCH(int, expectedRotation);
+
+    QQuickView window;
+    QByteArray errorMessage;
+    QVERIFY2(QQuickTest::initView(window, testFileUrl("rectWheel.qml"), true, &errorMessage), errorMessage.constData());
+    window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+
+    QQuickItem *rect = window.rootObject();
+    QVERIFY(rect != nullptr);
+    QQuickWheelHandler *handler = rect->findChild<QQuickWheelHandler*>();
+    QVERIFY(handler != nullptr);
+    handler->setOrientation(orientation);
+    handler->setInvertible(invertible);
+    handler->setRotationScale(rotationScale);
+    handler->setProperty(property);
+    handler->setTargetScaleMultiplier(targetScaleMultiplier);
+    handler->setTargetTransformAroundCursor(targetTransformAroundCursor);
+    QSignalSpy activeChangedSpy(handler, SIGNAL(activeChanged()));
+
+    if (eventPhases) {
+        sendWheelEvent(window, eventPos, QPoint(), QPoint(), eventModifiers, Qt::ScrollBegin, eventInverted);
+        sendWheelEvent(window, eventPos, eventAngleDelta, eventPixelDelta, eventModifiers, Qt::ScrollUpdate, eventInverted);
+    } else {
+        sendWheelEvent(window, eventPos, eventAngleDelta, eventPixelDelta, eventModifiers, Qt::NoScrollPhase, eventInverted);
+    }
+    QCOMPARE(rect->position().toPoint(), expectedPosition);
+    QCOMPARE(activeChangedSpy.count(), 1);
+    QCOMPARE(handler->active(), true);
+    QCOMPARE(rect->scale(), expectedScale);
+    QCOMPARE(rect->rotation(), expectedRotation);
+    if (!eventPhases) {
+        QTRY_COMPARE(handler->active(), false);
+        QCOMPARE(activeChangedSpy.count(), 2);
+    }
+
+    // restore by rotating backwards
+    if (eventPhases) {
+        sendWheelEvent(window, eventPos, eventAngleDelta * -1, eventPixelDelta * -1, eventModifiers, Qt::ScrollUpdate, eventInverted);
+        sendWheelEvent(window, eventPos, QPoint(), QPoint(), eventModifiers, Qt::ScrollEnd, eventInverted);
+    } else {
+        sendWheelEvent(window, eventPos, eventAngleDelta * -1, eventPixelDelta * -1, eventModifiers, Qt::NoScrollPhase, eventInverted);
+    }
+    QCOMPARE(activeChangedSpy.count(), eventPhases ? 2 : 3);
+    QCOMPARE(handler->active(), !eventPhases);
+    QCOMPARE(rect->position().toPoint(), QPoint(0, 0));
+    QCOMPARE(rect->scale(), 1);
+    QCOMPARE(rect->rotation(), 0);
+}
+
+void tst_QQuickWheelHandler::nestedHandler_data()
+{
+    // handler properties
+    QTest::addColumn<Qt::Orientation>("orientation");
+    QTest::addColumn<bool>("invertible");
+    QTest::addColumn<int>("rotationScale");
+    QTest::addColumn<QString>("property");
+    QTest::addColumn<qreal>("targetScaleMultiplier");
+    QTest::addColumn<bool>("targetTransformAroundCursor");
+    // event
+    QTest::addColumn<QPoint>("eventPos");
+    QTest::addColumn<QPoint>("eventAngleDelta");
+    QTest::addColumn<QPoint>("eventPixelDelta");
+    QTest::addColumn<Qt::KeyboardModifiers>("eventModifiers");
+    QTest::addColumn<bool>("eventPhases");
+    QTest::addColumn<bool>("eventInverted");
+    QTest::addColumn<int>("eventCount");
+    // result: inner handler
+    QTest::addColumn<QPoint>("innerPosition");
+    QTest::addColumn<qreal>("innerScale");
+    QTest::addColumn<int>("innerRotation");
+    // result: outer handler
+    QTest::addColumn<QPoint>("outerPosition");
+    QTest::addColumn<qreal>("outerScale");
+    QTest::addColumn<int>("outerRotation");
+
+    // move the item
+    QTest::newRow("vertical wheel angle delta to adjust x")
+            << Qt::Vertical << false << 1 << "x" << 1.5 << true
+            << QPoint(160, 120) << QPoint(120, 120) << QPoint() << Qt::KeyboardModifiers(Qt::NoModifier) << false << false << 10
+            << QPoint(175,60) << 1.0 << 0
+            << QPoint(75, 0) << 1.0 << 0;
+    QTest::newRow("horizontal wheel pixel delta to adjust y")
+            << Qt::Horizontal << false << 1 << "y" << 1.5 << false
+            << QPoint(160, 120) << QPoint(120, 120) << QPoint(50, 50) << Qt::KeyboardModifiers(Qt::NoModifier) << true << false << 4
+            << QPoint(100, 160) << 1.0 << 0
+            << QPoint(0, 100) << 1.0 << 0;
+}
+
+void tst_QQuickWheelHandler::nestedHandler()
+{
+    // handler properties
+    QFETCH(Qt::Orientation, orientation);
+    QFETCH(bool, invertible);
+    QFETCH(int, rotationScale);
+    QFETCH(QString, property);
+    QFETCH(qreal, targetScaleMultiplier);
+    QFETCH(bool, targetTransformAroundCursor);
+    // event
+    QFETCH(QPoint, eventPos);
+    QFETCH(QPoint, eventAngleDelta);
+    QFETCH(QPoint, eventPixelDelta);
+    QFETCH(Qt::KeyboardModifiers, eventModifiers);
+    QFETCH(bool, eventPhases);
+    QFETCH(bool, eventInverted);
+    QFETCH(int, eventCount);
+    // result: inner handler
+    QFETCH(QPoint, innerPosition);
+    QFETCH(qreal, innerScale);
+    QFETCH(int, innerRotation);
+    // result: outer handler
+    QFETCH(QPoint, outerPosition);
+    QFETCH(qreal, outerScale);
+    QFETCH(int, outerRotation);
+
+    QQuickView window;
+    QByteArray errorMessage;
+    QVERIFY2(QQuickTest::initView(window, testFileUrl("nested.qml"), true, &errorMessage), errorMessage.constData());
+    window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+
+    QQuickItem *outerRect = window.rootObject();
+    QVERIFY(outerRect != nullptr);
+    QQuickWheelHandler *outerHandler = outerRect->findChild<QQuickWheelHandler*>("outerWheelHandler");
+    QVERIFY(outerHandler != nullptr);
+    QQuickWheelHandler *innerHandler = outerRect->findChild<QQuickWheelHandler*>("innerWheelHandler");
+    QVERIFY(innerHandler != nullptr);
+    QQuickItem *innerRect = innerHandler->parentItem();
+    QVERIFY(innerRect != nullptr);
+    innerHandler->setOrientation(orientation);
+    innerHandler->setInvertible(invertible);
+    innerHandler->setRotationScale(rotationScale);
+    innerHandler->setProperty(property);
+    innerHandler->setTargetScaleMultiplier(targetScaleMultiplier);
+    innerHandler->setTargetTransformAroundCursor(targetTransformAroundCursor);
+    outerHandler->setOrientation(orientation);
+    outerHandler->setInvertible(invertible);
+    outerHandler->setRotationScale(rotationScale);
+    outerHandler->setProperty(property);
+    outerHandler->setTargetScaleMultiplier(targetScaleMultiplier);
+    outerHandler->setTargetTransformAroundCursor(targetTransformAroundCursor);
+    QSignalSpy innerActiveChangedSpy(innerHandler, SIGNAL(activeChanged()));
+    QSignalSpy outerActiveChangedSpy(outerHandler, SIGNAL(activeChanged()));
+
+    if (eventPhases)
+        sendWheelEvent(window, eventPos, QPoint(), QPoint(), eventModifiers, Qt::ScrollBegin, eventInverted);
+    for (int i = 0; i < eventCount; ++i)
+        sendWheelEvent(window, eventPos, eventAngleDelta, eventPixelDelta, eventModifiers,
+                       (eventPhases ? Qt::ScrollUpdate : Qt::NoScrollPhase), eventInverted);
+    QCOMPARE(innerRect->position().toPoint(), innerPosition);
+
+    /*
+        If outer is activated, maybe inner should be deactivated? But the event
+        doesn't get delivered to inner anymore, so it doesn't find out that
+        it's no longer getting events. It will get deactivated after the
+        timeout, just as if the user stopped scrolling.
+
+        This situation is similar to QTBUG-50199, but it's questionable whether
+        that was really so important. So far in Qt Quick, if you move the mouse
+        while wheel momentum continues, or if the item moves out from under the
+        mouse, a different item starts getting the events immediately. In
+        non-Qt applications on most OSes, that's quite normal.
+    */
+    // QCOMPARE(innerActiveChangedSpy.count(), 2);
+    // QCOMPARE(innerHandler->active(), false);
+    QCOMPARE(innerRect->scale(), innerScale);
+    QCOMPARE(innerRect->rotation(), innerRotation);
+    QCOMPARE(outerRect->position().toPoint(), outerPosition);
+    QCOMPARE(outerActiveChangedSpy.count(), 1);
+    QCOMPARE(outerHandler->active(), true);
+    QCOMPARE(outerRect->scale(), outerScale);
+    QCOMPARE(outerRect->rotation(), outerRotation);
+    if (!eventPhases) {
+        QTRY_COMPARE(outerHandler->active(), false);
+        QCOMPARE(outerActiveChangedSpy.count(), 2);
+    }
+}
+
+QTEST_MAIN(tst_QQuickWheelHandler)
+
+#include "tst_qquickwheelhandler.moc"
diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro
index 8bb1f47af5..cd0a0fbb15 100644
--- a/tests/auto/quick/qquickanimations/qquickanimations.pro
+++ b/tests/auto/quick/qquickanimations/qquickanimations.pro
@@ -8,7 +8,7 @@ macx:CONFIG -= app_bundle
 
 TESTDATA = data/*
 
-QT += core-private gui-private  qml-private quick-private testlib
+QT += core-private gui-private  qml-private quick-private testlib qmlmodels-private
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
 OTHER_FILES += \
diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
index 961506372a..b75dc8bc6b 100644
--- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
+++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
@@ -30,7 +30,7 @@
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuick/qquickview.h>
 #include <QtQml/private/qqmltimer_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
 #include <QtQml/private/qanimationgroupjob_p.h>
 #include <QtQuick/private/qquickrectangle_p.h>
 #include <QtQuick/private/qquickitemanimation_p.h>
diff --git a/tests/auto/quick/qquickapplication/BLACKLIST b/tests/auto/quick/qquickapplication/BLACKLIST
new file mode 100644
index 0000000000..1b7464e7c4
--- /dev/null
+++ b/tests/auto/quick/qquickapplication/BLACKLIST
@@ -0,0 +1,3 @@
+[active]
+opensuse-42.3
+opensuse-leap
diff --git a/tests/auto/quick/qquickboundaryrule/data/dragHandler.qml b/tests/auto/quick/qquickboundaryrule/data/dragHandler.qml
new file mode 100644
index 0000000000..c66fd76ff1
--- /dev/null
+++ b/tests/auto/quick/qquickboundaryrule/data/dragHandler.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.14
+import Qt.labs.animation 1.0
+
+Rectangle {
+    id: root
+    width: 240; height: 120
+    color: "green"
+
+    DragHandler {
+        id: dragHandler
+        yAxis.minimum: -1000
+        xAxis.minimum: -1000
+        onActiveChanged: if (!active) xbr.returnToBounds();
+    }
+
+    BoundaryRule on x {
+        id: xbr
+        minimum: -50
+        maximum: 100
+        minimumOvershoot: 40
+        maximumOvershoot: 40
+    }
+}
diff --git a/tests/auto/quick/qquickboundaryrule/qquickboundaryrule.pro b/tests/auto/quick/qquickboundaryrule/qquickboundaryrule.pro
new file mode 100644
index 0000000000..ef43f4526a
--- /dev/null
+++ b/tests/auto/quick/qquickboundaryrule/qquickboundaryrule.pro
@@ -0,0 +1,12 @@
+CONFIG += testcase
+TARGET = tst_qquickboundaryrule
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qquickboundaryrule.cpp
+
+include (../../shared/util.pri)
+include (../shared/util.pri)
+
+TESTDATA = data/*
+
+QT += core-private gui-private  qml-private quick-private testlib
diff --git a/tests/auto/quick/qquickboundaryrule/tst_qquickboundaryrule.cpp b/tests/auto/quick/qquickboundaryrule/tst_qquickboundaryrule.cpp
new file mode 100644
index 0000000000..44f1c9a2f9
--- /dev/null
+++ b/tests/auto/quick/qquickboundaryrule/tst_qquickboundaryrule.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <qsignalspy.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQuick/qquickview.h>
+#include <QtQuick/private/qquickboundaryrule_p.h>
+#include <QtQuick/private/qquickdraghandler_p.h>
+#include "../../shared/util.h"
+#include "../shared/viewtestutil.h"
+
+class tst_qquickboundaryrule : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_qquickboundaryrule() {}
+
+private slots:
+    void init() { qApp->processEvents(); }  //work around animation timer bug (QTBUG-22865)
+    void dragHandler();
+};
+
+void tst_qquickboundaryrule::dragHandler()
+{
+    QQuickView window;
+    QByteArray errorMessage;
+    QVERIFY2(QQuickTest::initView(window, testFileUrl("dragHandler.qml"), true, &errorMessage), errorMessage.constData());
+    window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+    QQuickItem *target = window.rootObject();
+    QVERIFY(target);
+    QQuickDragHandler *dragHandler = target->findChild<QQuickDragHandler*>();
+    QVERIFY(dragHandler);
+    QQuickBoundaryRule *boundaryRule = target->findChild<QQuickBoundaryRule*>();
+    QVERIFY(boundaryRule);
+    QSignalSpy overshootChangedSpy(boundaryRule, SIGNAL(currentOvershootChanged()));
+
+    QPoint p1(10, 10);
+    QTest::mousePress(&window, Qt::LeftButton, Qt::NoModifier, p1);
+    // unrestricted drag
+    p1 += QPoint(100, 0);
+    QTest::mouseMove(&window, p1);
+    QTRY_VERIFY(dragHandler->active());
+    QCOMPARE(target->position().x(), 100);
+    QCOMPARE(boundaryRule->currentOvershoot(), 0);
+    QCOMPARE(boundaryRule->peakOvershoot(), 0);
+    QCOMPARE(overshootChangedSpy.count(), 0);
+    // restricted drag: halfway into overshoot
+    p1 += QPoint(20, 0);
+    QTest::mouseMove(&window, p1);
+    QCOMPARE(target->position().x(), 117.5);
+    QCOMPARE(boundaryRule->currentOvershoot(), 20);
+    QCOMPARE(boundaryRule->peakOvershoot(), 20);
+    QCOMPARE(overshootChangedSpy.count(), 1);
+    // restricted drag: maximum overshoot
+    p1 += QPoint(80, 0);
+    QTest::mouseMove(&window, p1);
+    QCOMPARE(target->position().x(), 140);
+    QCOMPARE(boundaryRule->currentOvershoot(), 100);
+    QCOMPARE(boundaryRule->peakOvershoot(), 100);
+    QCOMPARE(overshootChangedSpy.count(), 2);
+    // release and let it return to bounds
+    QTest::mouseRelease(&window, Qt::LeftButton, Qt::NoModifier, p1);
+    QTRY_COMPARE(dragHandler->active(), false);
+    QTRY_COMPARE(overshootChangedSpy.count(), 3);
+    QCOMPARE(boundaryRule->currentOvershoot(), 0);
+    QCOMPARE(boundaryRule->peakOvershoot(), 0);
+    QCOMPARE(target->position().x(), 100);
+}
+
+QTEST_MAIN(tst_qquickboundaryrule)
+
+#include "tst_qquickboundaryrule.moc"
diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro
index 5051f8bc62..0390637058 100644
--- a/tests/auto/quick/qquickgridview/qquickgridview.pro
+++ b/tests/auto/quick/qquickgridview/qquickgridview.pro
@@ -10,5 +10,5 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private quick-private testlib qmltest
+QT += core-private gui-private qml-private quick-private testlib qmltest qmlmodels-private
 
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 448096720c..b65b8770b1 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -40,7 +40,7 @@
 #include <QtQuick/private/qquickitemview_p_p.h>
 #include <QtQuick/private/qquickgridview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
 #include "../../shared/util.h"
 #include "../shared/viewtestutil.h"
 #include "../shared/visualtestutil.h"
diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro
index fd96c269a2..b08fca2b1d 100644
--- a/tests/auto/quick/qquicklistview/qquicklistview.pro
+++ b/tests/auto/quick/qquicklistview/qquicklistview.pro
@@ -18,5 +18,5 @@ include (../shared/util.pri)
 TESTDATA = data/*
 DISTFILES += data/*
 
-QT += core-private gui-private qml-private quick-private testlib qmltest
+QT += core-private gui-private qml-private quick-private testlib qmltest qmlmodels-private
 
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 2ea8a477a8..894a5ee16e 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -40,9 +40,9 @@
 #include <QtQuick/private/qquicklistview_p.h>
 #include <QtQuick/private/qquickmousearea_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQml/private/qqmlobjectmodel_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
-#include <QtQml/private/qqmldelegatemodel_p.h>
+#include <QtQmlModels/private/qqmlobjectmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmldelegatemodel_p.h>
 #include "../../shared/util.h"
 #include "../shared/viewtestutil.h"
 #include "../shared/visualtestutil.h"
diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro
index f21fb64fa4..5eb24b89bd 100644
--- a/tests/auto/quick/qquickpathview/qquickpathview.pro
+++ b/tests/auto/quick/qquickpathview/qquickpathview.pro
@@ -9,5 +9,5 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private quick-private testlib qmltest
+QT += core-private gui-private qml-private quick-private testlib qmltest qmlmodels-private
 qtHaveModule(widgets): QT += widgets
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 1a5ce39318..a1b2b64ae2 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -39,7 +39,7 @@
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuick/private/qquickrectangle_p.h>
 #include <QtQuickTest/QtQuickTest>
-#include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
 #include <QtQml/private/qqmlvaluetype_p.h>
 #include <QtGui/qstandarditemmodel.h>
 #include <QStringListModel>
diff --git a/tests/auto/quick/qquickrepeater/qquickrepeater.pro b/tests/auto/quick/qquickrepeater/qquickrepeater.pro
index 5554342943..aed5702266 100644
--- a/tests/auto/quick/qquickrepeater/qquickrepeater.pro
+++ b/tests/auto/quick/qquickrepeater/qquickrepeater.pro
@@ -9,4 +9,4 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib qmlmodels-private
diff --git a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
index f19f5f9877..65e7d29595 100644
--- a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
+++ b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
@@ -35,8 +35,8 @@
 #include <QtQml/qqmlincubator.h>
 #include <private/qquickrepeater_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
-#include <QtQml/private/qqmlobjectmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmlobjectmodel_p.h>
 #include <QtGui/qstandarditemmodel.h>
 
 #include "../../shared/util.h"
diff --git a/tests/auto/quick/qquicktableview/qquicktableview.pro b/tests/auto/quick/qquicktableview/qquicktableview.pro
index cf831ed5b5..da0c0b01d0 100644
--- a/tests/auto/quick/qquicktableview/qquicktableview.pro
+++ b/tests/auto/quick/qquicktableview/qquicktableview.pro
@@ -11,5 +11,5 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib qmlmodels-private
 
diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
index 420a9fdb13..6c339c16d1 100644
--- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
+++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
@@ -38,8 +38,8 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlexpression.h>
 #include <QtQml/qqmlincubator.h>
-#include <QtQml/private/qqmlobjectmodel_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmlobjectmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
 
 #include "testmodel.h"
 
diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
index 9222e39477..5445f6768d 100644
--- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
+++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
@@ -9,5 +9,5 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib qmlmodels-private
 qtHaveModule(widgets): QT += widgets
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index fac8283e2c..32008f675a 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -39,7 +39,7 @@
 #include <QtQuick/qquickview.h>
 #include <private/qquicklistview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQml/private/qqmldelegatemodel_p.h>
+#include <QtQmlModels/private/qqmldelegatemodel_p.h>
 #include <private/qqmlvaluetype_p.h>
 #include <private/qqmlchangeset_p.h>
 #include <private/qqmlengine_p.h>
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
index bb9f403188..1282a9d5ec 100644
--- a/tests/auto/quick/qquickwindow/BLACKLIST
+++ b/tests/auto/quick/qquickwindow/BLACKLIST
@@ -1,3 +1,6 @@
+[openglContextCreatedSignal]
+opensuse-42.3
+opensuse-leap
 # QTBUG-62177
 [attachedProperty]
 osx
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 7257a99d2a..b6ffdc0f7e 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -29,6 +29,7 @@ PRIVATETESTS += \
     qquickanimations \
     qquickapplication \
     qquickbehaviors \
+    qquickboundaryrule \
     qquickfontloader \
     qquickfontloader_static \
     qquickfontmetrics \