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

Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105

52 files changed, 830 insertions, 381 deletions

diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
index d9f64f3899..84f5eebd10 100644
--- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
@@ -321,6 +321,8 @@ private slots:
     void lastLineOfConditional();
 
     void readThis();
+    void signalParameters();
+
 private:
     QV4Debugger *debugger() const
     {
@@ -898,6 +900,31 @@ void tst_qv4debugger::readThis()
     QCOMPARE(a.value("value").toInt(), 5);
 }
 
+void tst_qv4debugger::signalParameters()
+{
+    QQmlEngine engine;
+    QV4::ExecutionEngine *v4 = engine.handle();
+    v4->setDebugger(new QV4Debugger(v4));
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQml 2.12\n"
+                      "QtObject {\n"
+                      "    id: root\n"
+                      "    property string result\n"
+                      "    signal signalWithArg(string textArg)\n"
+                      "    property Connections connections : Connections {\n"
+                      "        target: root\n"
+                      "        onSignalWithArg: { root.result = textArg; }\n"
+                      "    }\n"
+                      "    Component.onCompleted: signalWithArg('something')\n"
+                      "}", QUrl("test.qml"));
+
+    QVERIFY(component.isReady());
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(obj);
+    QCOMPARE(obj->property("result").toString(), QLatin1String("something"));
+}
+
 QTEST_MAIN(tst_qv4debugger)
 
 #include "tst_qv4debugger.moc"
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 9c3316e39f..6ca2663f30 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -245,6 +245,9 @@ private slots:
     void equality();
     void aggressiveGc();
 
+    void interrupt_data();
+    void interrupt();
+
 public:
     Q_INVOKABLE QJSValue throwingCppMethod1();
     Q_INVOKABLE void throwingCppMethod2();
@@ -4839,6 +4842,82 @@ void tst_QJSEngine::aggressiveGc()
     qputenv("QV4_MM_AGGRESSIVE_GC", origAggressiveGc);
 }
 
+void tst_QJSEngine::interrupt_data()
+{
+    QTest::addColumn<int>("jitThreshold");
+    QTest::addColumn<QString>("code");
+
+    const int big = (1 << 24);
+    for (int i = 0; i <= big; i += big) {
+        const char *mode = i ? "interpret" : "jit";
+        QTest::addRow("for with content / %s", mode)   << i << "var a = 0; for (;;) { a += 2; }";
+        QTest::addRow("for empty / %s", mode)          << i << "for (;;) {}";
+        QTest::addRow("for continue / %s", mode)       << i << "for (;;) { continue; }";
+        QTest::addRow("while with content / %s", mode) << i << "var a = 0; while (true) { a += 2; }";
+        QTest::addRow("while empty / %s", mode)        << i << "while (true) {}";
+        QTest::addRow("while continue / %s", mode)     << i << "while (true) { continue; }";
+        QTest::addRow("do with content / %s", mode)    << i << "var a = 0; do { a += 2; } while (true);";
+        QTest::addRow("do empty / %s", mode)           << i << "do {} while (true);";
+        QTest::addRow("do continue / %s", mode)        << i << "do { continue; } while (true);";
+        QTest::addRow("nested loops / %s", mode)       << i << "while (true) { for (;;) {} }";
+        QTest::addRow("labeled continue / %s", mode)   << i << "a: while (true) { for (;;) { continue a; } }";
+        QTest::addRow("labeled break / %s", mode)      << i << "while (true) { a: for (;;) { break a; } }";
+        QTest::addRow("tail call / %s", mode)          << i << "'use strict';\nfunction x() { return x(); }; x();";
+    }
+}
+
+class TemporaryJitThreshold
+{
+    Q_DISABLE_COPY_MOVE(TemporaryJitThreshold)
+public:
+    TemporaryJitThreshold(int threshold) {
+        m_wasSet = qEnvironmentVariableIsSet(m_envVar);
+        m_value = qgetenv(m_envVar);
+        qputenv(m_envVar, QByteArray::number(threshold));
+    }
+
+    ~TemporaryJitThreshold()
+    {
+        if (m_wasSet)
+            qputenv(m_envVar, m_value);
+        else
+            qunsetenv(m_envVar);
+    }
+
+private:
+    const char *m_envVar = "QV4_JIT_CALL_THRESHOLD";
+    bool m_wasSet = false;
+    QByteArray m_value;
+};
+
+void tst_QJSEngine::interrupt()
+{
+    QFETCH(int, jitThreshold);
+    QFETCH(QString, code);
+
+    TemporaryJitThreshold threshold(jitThreshold);
+    Q_UNUSED(threshold);
+
+    QJSEngine *engineInThread = nullptr;
+    QScopedPointer<QThread> worker(QThread::create([&engineInThread, &code, jitThreshold](){
+        QJSEngine jsEngine;
+        engineInThread = &jsEngine;
+        QJSValue result = jsEngine.evaluate(code);
+        QVERIFY(jsEngine.isInterrupted());
+        QVERIFY(result.isError());
+        QCOMPARE(result.toString(), QString::fromLatin1("Error: Interrupted"));
+        engineInThread = nullptr;
+    }));
+    worker->start();
+
+    QTRY_VERIFY(engineInThread);
+
+    engineInThread->setInterrupted(true);
+
+    QVERIFY(worker->wait());
+    QVERIFY(!engineInThread);
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 86f36286d9..db9bb52010 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -105,7 +105,3 @@ qtConfig(private_tests): \
 qtNomakeTools( \
     qmlplugindump \
 )
-
-QtConfig(qml_tracing) {
-    PRIVATETESTS += v4traced
-}
diff --git a/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro b/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro
index 9f854f1fa2..cdac5c0ff9 100644
--- a/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro
+++ b/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro
@@ -4,4 +4,4 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmlchangeset.cpp
 
-QT += core-private gui-private qml-private testlib
+QT += core-private gui-private qml-private testlib qmlmodels-private
diff --git a/tests/auto/qml/qqmlecmascript/data/undefinedPropertiesInObjectWrapper.qml b/tests/auto/qml/qqmlecmascript/data/undefinedPropertiesInObjectWrapper.qml
new file mode 100644
index 0000000000..7e2f15fc23
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/undefinedPropertiesInObjectWrapper.qml
@@ -0,0 +1,20 @@
+import QtQuick 2.12
+
+QtObject {
+    property list<QtObject> entries: [
+        QtObject {
+            readonly property color color: "green"
+        },
+        QtObject {
+        }
+    ]
+
+    property Row row: Row {
+        Repeater {
+            model: entries
+            Rectangle {
+                color: model.color ? model.color : "red"
+            }
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 98f9bfe3ef..72a524ece5 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -367,6 +367,8 @@ private slots:
     void deleteSparseInIteration();
     void saveAccumulatorBeforeToInt32();
     void intMinDividedByMinusOne();
+    void undefinedPropertiesInObjectWrapper();
+    void hugeRegexpQuantifiers();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -8984,6 +8986,25 @@ void tst_qqmlecmascript::intMinDividedByMinusOne()
     QCOMPARE(object->property("doesNotFitInInt").toUInt(), 2147483648u);
 }
 
+void tst_qqmlecmascript::undefinedPropertiesInObjectWrapper()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFile("undefinedPropertiesInObjectWrapper.qml"));
+    QVERIFY(component.isReady());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+}
+
+void tst_qqmlecmascript::hugeRegexpQuantifiers()
+{
+    QJSEngine engine;
+    QJSValue value = engine.evaluate("/({3072140529})?{3072140529}/");
+
+    // It's a regular expression, but it won't match anything.
+    // The RegExp compiler also shouldn't crash.
+    QVERIFY(value.isRegExp());
+}
+
 QTEST_MAIN(tst_qqmlecmascript)
 
 #include "tst_qqmlecmascript.moc"
diff --git a/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro b/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
index 542ec44736..e8ed8e91b1 100644
--- a/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
+++ b/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
@@ -9,4 +9,4 @@ include (../../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private qml-private testlib
+QT += core-private gui-private qml-private testlib qmlmodels-private
diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
index a66f13e6bb..9c5e09c77c 100644
--- a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -31,7 +31,7 @@
 
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
-#include <QtQml/private/qqmlinstantiator_p.h>
+#include <QtQmlModels/private/qqmlinstantiator_p.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlincubator.h>
 #include "../../shared/util.h"
diff --git a/tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml b/tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml
new file mode 100644
index 0000000000..8a1535ff50
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml
@@ -0,0 +1,15 @@
+import QtQml 2.0
+
+QtObject {
+    id: root
+
+    property QtObject target: QtObject {
+        Component.onCompleted: {
+            root.connections.target = root.target.Component
+        }
+    }
+
+    property Connections connections: Connections {
+        ignoreUnknownSignals: true
+    }
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 1b4ff71beb..b97c75e2ce 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -301,6 +301,8 @@ private slots:
     void polymorphicFunctionLookup();
     void anchorsToParentInPropertyChanges();
 
+    void typeWrapperToVariant();
+
 private:
     QQmlEngine engine;
     QStringList defaultImportPathList;
@@ -5087,6 +5089,19 @@ void tst_qqmllanguage::anchorsToParentInPropertyChanges()
     QTRY_COMPARE(o->property("edgeWidth").toInt(), 200);
 }
 
+void tst_qqmllanguage::typeWrapperToVariant()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("typeWrapperToVariant.qml"));
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+    QVERIFY(!o.isNull());
+    QObject *connections = qvariant_cast<QObject *>(o->property("connections"));
+    QVERIFY(connections);
+    QObject *target = qvariant_cast<QObject *>(connections->property("target"));
+    QVERIFY(target);
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"
diff --git a/tests/auto/qml/qqmllistcompositor/qqmllistcompositor.pro b/tests/auto/qml/qqmllistcompositor/qqmllistcompositor.pro
index 4ada590a2a..62ad85547e 100644
--- a/tests/auto/qml/qqmllistcompositor/qqmllistcompositor.pro
+++ b/tests/auto/qml/qqmllistcompositor/qqmllistcompositor.pro
@@ -4,4 +4,4 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmllistcompositor.cpp
 
-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/qml/qqmllistmodel/qqmllistmodel.pro b/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro
index 8e3aed0baf..4d44d6b22b 100644
--- a/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro
+++ b/tests/auto/qml/qqmllistmodel/qqmllistmodel.pro
@@ -8,4 +8,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/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
index 2022a0d892..77ab0ecbc0 100644
--- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
+++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
@@ -30,7 +30,7 @@
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuick/private/qquickanimation_p.h>
 #include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
 #include <QtQml/private/qqmlexpression_p.h>
 #include <QQmlComponent>
 
diff --git a/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro b/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro
index 9e1cea9867..de58c0c075 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro
+++ b/tests/auto/qml/qqmllistmodelworkerscript/qqmllistmodelworkerscript.pro
@@ -8,4 +8,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/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp b/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp
index 236a13a6f8..b5e8800d0e 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp
+++ b/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp
@@ -29,7 +29,7 @@
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQmlModels/private/qqmllistmodel_p.h>
 #include <QtQml/private/qqmlexpression_p.h>
 #include <QQmlComponent>
 
diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
index 1878cccd39..76185a97e0 100644
--- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
+++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
@@ -549,8 +549,8 @@ void tst_qqmlmetatype::unregisterAttachedProperties()
         c.setData("import QtQuick 2.2\n Item { }", dummy);
 
         const QQmlType attachedType = QQmlMetaType::qmlType("QtQuick/KeyNavigation", 2, 2);
-        QCOMPARE(attachedType.attachedPropertiesId(QQmlEnginePrivate::get(&e)),
-                 attachedType.index());
+        QCOMPARE(attachedType.attachedPropertiesType(QQmlEnginePrivate::get(&e)),
+                 attachedType.metaObject());
 
         QVERIFY(c.create());
     }
@@ -568,8 +568,8 @@ void tst_qqmlmetatype::unregisterAttachedProperties()
                   "Item { KeyNavigation.up: null }", dummy);
 
         const QQmlType attachedType = QQmlMetaType::qmlType("QtQuick/KeyNavigation", 2, 2);
-        QCOMPARE(attachedType.attachedPropertiesId(QQmlEnginePrivate::get(&e)),
-                 attachedType.index());
+        QCOMPARE(attachedType.attachedPropertiesType(QQmlEnginePrivate::get(&e)),
+                 attachedType.metaObject());
 
         QVERIFY(c.create());
     }
diff --git a/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro b/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro
index 88bb630e29..5746ff754a 100644
--- a/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro
+++ b/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro
@@ -5,4 +5,4 @@ osx:CONFIG -= app_bundle
 SOURCES += tst_qqmlobjectmodel.cpp
 
 QT += qml testlib
-QT += core-private qml-private
+QT += core-private qml-private qmlmodels-private
diff --git a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
index fb63d811a8..6691fa43a0 100644
--- a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
+++ b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
@@ -25,8 +25,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtQml/private/qqmlobjectmodel_p.h>
-#include <QtQml/private/qqmlchangeset_p.h>
+#include <QtQmlModels/private/qqmlobjectmodel_p.h>
+#include <QtQmlModels/private/qqmlchangeset_p.h>
 #include <QtTest/qsignalspy.h>
 #include <QtTest/qtest.h>
 
diff --git a/tests/auto/qml/qqmltablemodel/qqmltablemodel.pro b/tests/auto/qml/qqmltablemodel/qqmltablemodel.pro
index 11b11132aa..9d298dfdf2 100644
--- a/tests/auto/qml/qqmltablemodel/qqmltablemodel.pro
+++ b/tests/auto/qml/qqmltablemodel/qqmltablemodel.pro
@@ -7,4 +7,4 @@ include (../../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core gui qml-private qml quick-private quick testlib
+QT += core gui qml-private qml quick-private quick testlib qmlmodels-private
diff --git a/tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp b/tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp
index 113a27494d..d913bcdf9a 100644
--- a/tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp
+++ b/tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp
@@ -30,7 +30,7 @@
 #include <QtTest/qsignalspy.h>
 #include <QtCore/qregularexpression.h>
 #include <QtQml/private/qqmlengine_p.h>
-#include <QtQml/private/qqmltablemodel_p.h>
+#include <QtQmlModels/private/qqmltablemodel_p.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
diff --git a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
index fd50ff5020..392ce16880 100644
--- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
+++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
@@ -140,23 +140,17 @@ void tst_QV4Assembler::functionTable()
 #endif
 }
 
-#ifdef V4_ENABLE_JIT
-#define JIT_ENABLED 1
-#else
-#define JIT_ENABLED 0
-#endif
-
 void tst_QV4Assembler::jitEnabled()
 {
 #if defined(Q_OS_IOS) || defined(Q_OS_TVOS)
     /* JIT should be disabled on iOS and tvOS. */
-    QCOMPARE(JIT_ENABLED, 0);
+    QVERIFY(!QT_CONFIG(qml_jit));
 #elif defined(Q_OS_WIN) && defined(Q_PROCESSOR_ARM)
     /* JIT should be disabled Windows on ARM/ARM64 for now. */
-    QCOMPARE(JIT_ENABLED, 0);
+    QVERIFY(!QT_CONFIG(qml_jit));
 #else
     /* JIT should be enabled on all other architectures/OSes tested in CI. */
-    QCOMPARE(JIT_ENABLED, 1);
+    QVERIFY(QT_CONFIG(qml_jit));
 #endif
 }
 
diff --git a/tests/auto/qml/v4traced/tst_v4traced.cpp b/tests/auto/qml/v4traced/tst_v4traced.cpp
deleted file mode 100644
index f82cc0ed5e..0000000000
--- a/tests/auto/qml/v4traced/tst_v4traced.cpp
+++ /dev/null
@@ -1,325 +0,0 @@
-/****************************************************************************
-**
-** 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 <QJSEngine>
-#include <private/qjsvalue_p.h>
-#include <private/qv4scopedvalue_p.h>
-#include <private/qv4script_p.h>
-
-class EnvVarSaver
-{
-public:
-    EnvVarSaver(const char *name, const QByteArray &newValue)
-        : _name(name)
-    {
-        _wasSet = qEnvironmentVariableIsSet(name);
-        if (_wasSet)
-            _oldValue = qgetenv(name);
-        qputenv(name, newValue);
-    }
-
-    ~EnvVarSaver()
-    {
-        if (_wasSet)
-            qputenv(_name, _oldValue);
-        else
-            qunsetenv(_name);
-    }
-
-private:
-    const char *_name;
-    bool _wasSet;
-    QByteArray _oldValue;
-};
-
-class tst_v4traced : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void collectTraces_data();
-    void collectTraces();
-
-    void binopI32deopt_data();
-    void binopI32deopt();
-
-    void calls_data();
-    void calls();
-
-    void setLookup();
-    void construct();
-};
-
-void tst_v4traced::collectTraces_data()
-{
-    QTest::addColumn<QString>("code");
-    QTest::addColumn<int>("tracePointCount");
-    QTest::addColumn<int>("interestingTracePoint");
-    QTest::addColumn<quint8>("expectedBits");
-
-    QTest::newRow("int+")    << "var a = 4; a + 2"     << 2 << 1 << quint8(QV4::ObservedTraceValues::Integer);
-    QTest::newRow("double+") << "var a = 4.1; a + 1.9" << 2 << 1 << quint8(QV4::ObservedTraceValues::Double);
-    QTest::newRow("object+") << "var a = '4'; a + '2'" << 2 << 1 << quint8(QV4::ObservedTraceValues::Other);
-}
-
-void tst_v4traced::collectTraces()
-{
-    QFETCH(QString, code);
-    QFETCH(int, tracePointCount);
-    QFETCH(int, interestingTracePoint);
-    QFETCH(quint8, expectedBits);
-
-    EnvVarSaver forceInterpreter("QV4_FORCE_INTERPRETER", "1");
-    EnvVarSaver forceTracing("QV4_FORCE_TRACING", "1");
-
-    QV4::ExecutionEngine vm;
-    QV4::Scope scope(&vm);
-    QV4::ScopedContext ctx(scope, vm.rootContext());
-    QV4::ScopedValue result(scope);
-    QScopedPointer<QV4::Script> script;
-    script.reset(new QV4::Script(ctx, QV4::Compiler::ContextType::Global, code, "collectTraces"));
-    script->parseAsBinding = false;
-
-    QVERIFY(!scope.engine->hasException);
-    script->parse();
-    QVERIFY(!scope.engine->hasException);
-
-    QVERIFY(script->function()->tracingEnabled());
-    result = script->run();
-    QVERIFY(!scope.engine->hasException);
-
-    QCOMPARE(int(script->function()->compiledFunction->nTraceInfos), tracePointCount);
-    QCOMPARE(*script->function()->traceInfo(interestingTracePoint), expectedBits);
-}
-
-void tst_v4traced::binopI32deopt_data()
-{
-    QTest::addColumn<QString>("operand");
-    QTest::addColumn<int>("int_arg1");
-    QTest::addColumn<int>("int_arg2");
-    QTest::addColumn<int>("int_result");
-    QTest::addColumn<QString>("other_arg1");
-    QTest::addColumn<QString>("other_arg2");
-    QTest::addColumn<double>("other_result");
-
-    QTest::newRow("+") << "+" << 1 << 2 << 3 << "1.1" << "1.9" << 3.0;
-    QTest::newRow("-") << "-" << 3 << 2 << 1 << "3.1" << "2.1" << 1.0;
-    QTest::newRow("*") << "*" << 2 << 3 << 6 << "2.1" << "1.9" << 3.99;
-    QTest::newRow("/") << "/" << 6 << 3 << 2 << "6.6" << "3.3" << 2.0;
-
-    QTest::newRow("&") << "&" << 6 << 3 << 2 << "'6'" << "'3'" << 2.0;
-    QTest::newRow("|") << "|" << 6 << 3 << 7 << "'6'" << "'3'" << 7.0;
-    QTest::newRow("^") << "^" << 6 << 3 << 5 << "'6'" << "'3'" << 5.0;
-
-    QTest::newRow("<<") << "<<" << 5 << 1 << 10 << "'5'" << "'1'" << 10.0;
-    QTest::newRow(">>") << ">>" << -1 << 1 << -1 << "'-1'" << "'1'" << -1.0;
-    QTest::newRow(">>>") << ">>>" << -1 << 1 << 0x7FFFFFFF << "'-1'" << "'1'" << 2147483647.0;
-
-    QTest::newRow("==") << "==" << 2 << 1 << 0 << "'2'" << "'1'" << 0.0;
-    QTest::newRow("!=") << "!=" << 2 << 1 << 1 << "'2'" << "'1'" << 1.0;
-    QTest::newRow("<" ) << "<"  << 2 << 1 << 0 << "'2'" << "'1'" << 0.0;
-    QTest::newRow("<=") << "<=" << 2 << 1 << 0 << "'2'" << "'1'" << 0.0;
-    QTest::newRow(">" ) << ">"  << 2 << 1 << 1 << "'2'" << "'1'" << 1.0;
-    QTest::newRow(">=") << ">=" << 2 << 1 << 1 << "'2'" << "'1'" << 1.0;
-}
-
-void tst_v4traced::binopI32deopt()
-{
-    QFETCH(QString, operand);
-    QFETCH(int, int_arg1);
-    QFETCH(int, int_arg2);
-    QFETCH(int, int_result);
-    QFETCH(QString, other_arg1);
-    QFETCH(QString, other_arg2);
-    QFETCH(double, other_result);
-
-    QString func = QStringLiteral("function binopI32(a, b) { return a %1 b }").arg(operand);
-    QString intCall = QStringLiteral("binopI32(%1, %2)").arg(int_arg1).arg(int_arg2);
-    QString otherCall = QStringLiteral("binopI32(%1, %2)").arg(other_arg1).arg(other_arg2);
-
-    QJSEngine engine;
-    engine.evaluate(func);
-
-    QCOMPARE(engine.evaluate(intCall).toInt(), int_result); // interpret + trace
-    QCOMPARE(engine.evaluate(intCall).toInt(), int_result); // jit
-    QCOMPARE(engine.evaluate(otherCall).toNumber(), other_result); // deopt
-    QCOMPARE(engine.evaluate(otherCall).toNumber(), other_result); // retrace
-    QCOMPARE(engine.evaluate(otherCall).toNumber(), other_result); // rejit
-}
-
-void tst_v4traced::calls_data()
-{
-    QTest::addColumn<QString>("call");
-
-    QTest::newRow("callGlobalLookup") << "globalLookup";
-    QTest::newRow("callPropertyLookup") << "obj.propertyLookup";
-}
-
-class Calls
-{
-public:
-    static int callCount;
-
-    static QV4::ReturnedValue doSomething(const QV4::FunctionObject */*o*/,
-                                          const QV4::Value */*thiz*/,
-                                          const QV4::Value *argv, int argc)
-    {
-        ++callCount;
-
-        if (argc == 0)
-            return QV4::Encode(42);
-
-        int prod = 1;
-        for (int i = 0; i < argc; ++i) {
-            Q_ASSERT(argv[i].isInteger());
-            prod *= argv[i].int_32();
-        }
-        return QV4::Encode(prod);
-    }
-};
-
-int Calls::callCount = 0;
-
-void tst_v4traced::calls()
-{
-    QFETCH(QString, call);
-
-    EnvVarSaver forceTracing("QV4_FORCE_TRACING", "1");
-    EnvVarSaver jitCallThreshold("QV4_JIT_CALL_THRESHOLD", "1");
-
-    QV4::ExecutionEngine vm;
-    QV4::Scope scope(&vm);
-    QV4::ScopedContext ctx(scope, vm.rootContext());
-    vm.globalObject->defineDefaultProperty(QLatin1String("globalLookup"),
-                                           Calls::doSomething);
-    QV4::ScopedObject obj(scope, vm.newObject());
-    vm.globalObject->defineDefaultProperty(QLatin1String("obj"), obj);
-    obj->defineDefaultProperty("propertyLookup", Calls::doSomething);
-
-    QString code = QStringLiteral(
-            "function doCalls() {\n"
-            "  if (%1() != 42) return false\n"
-            "  if (%1(21, 2) != 42) return false\n"
-            "  if (%1(2, 3, 7) != 42) return false\n"
-            "  return true\n"
-            "}\n"
-            "var result = true\n"
-            "for (var i = 0; i < 10; ++i) {\n"
-            "  if (!doCalls()) { result = false; break }"
-            "}\n"
-            "result\n").arg(call);
-    QScopedPointer<QV4::Script> script;
-    script.reset(new QV4::Script(ctx, QV4::Compiler::ContextType::Global, code, "call"));
-    script->parseAsBinding = false;
-
-    QVERIFY(!scope.engine->hasException);
-    script->parse();
-    QVERIFY(!scope.engine->hasException);
-
-    Calls::callCount = 0;
-    QV4::ScopedValue result(scope, script->run());
-    QVERIFY(!scope.engine->hasException);
-
-    QVERIFY(result->isBoolean());
-    QVERIFY(result->booleanValue());
-    QCOMPARE(Calls::callCount, 30);
-}
-
-void tst_v4traced::setLookup()
-{
-    EnvVarSaver forceTracing("QV4_FORCE_TRACING", "1");
-    EnvVarSaver jitCallThreshold("QV4_JIT_CALL_THRESHOLD", "1");
-
-    QV4::ExecutionEngine vm;
-    QV4::Scope scope(&vm);
-    QV4::ScopedContext ctx(scope, vm.rootContext());
-    QV4::ScopedObject obj(scope, vm.newObject());
-    vm.globalObject->defineDefaultProperty(QLatin1String("oracle"), obj);
-    obj->defineDefaultProperty("answer", QV4::Primitive::fromInt32(32));
-
-    QString code = QStringLiteral(
-                "function doit() {\n"
-                "  ++oracle.answer\n"
-                "}\n"
-                "for (var i = 0; i < 10; ++i) doit()\n"
-                "oracle.answer\n");
-    QScopedPointer<QV4::Script> script;
-    script.reset(new QV4::Script(ctx, QV4::Compiler::ContextType::Global, code, "setLookup"));
-    script->parseAsBinding = false;
-
-    QVERIFY(!scope.engine->hasException);
-    script->parse();
-    QVERIFY(!scope.engine->hasException);
-
-    QV4::ScopedValue result(scope, script->run());
-    QVERIFY(!scope.engine->hasException);
-
-    QVERIFY(result->isInteger());
-    QCOMPARE(result->int_32(), 42);
-}
-
-void tst_v4traced::construct()
-{
-    EnvVarSaver forceTracing("QV4_FORCE_TRACING", "1");
-    EnvVarSaver jitCallThreshold("QV4_JIT_CALL_THRESHOLD", "1");
-
-    QV4::ExecutionEngine vm;
-    QV4::Scope scope(&vm);
-    QV4::ScopedContext ctx(scope, vm.rootContext());
-    QV4::ScopedObject obj(scope, vm.newObject());
-    vm.globalObject->defineDefaultProperty(QLatin1String("oracle"), obj);
-    obj->defineDefaultProperty("answer", QV4::Primitive::fromInt32(32));
-
-    QString code = QStringLiteral(
-                "function doit() {\n"
-                "  this.arr = new Array()\n"
-                "  this.arr[0] = 0\n"
-                "  this.arr[1] = 1\n"
-                "  this.arr[2] = 2\n"
-                "}\n"
-                "var o\n"
-                "for (var i = 0; i < 10; ++i) o = new doit()\n"
-                "o.arr\n");
-    QScopedPointer<QV4::Script> script;
-    script.reset(new QV4::Script(ctx, QV4::Compiler::ContextType::Global, code, "setLookup"));
-    script->parseAsBinding = false;
-
-    QVERIFY(!scope.engine->hasException);
-    script->parse();
-    QVERIFY(!scope.engine->hasException);
-
-    QV4::ScopedValue result(scope, script->run());
-    QVERIFY(!scope.engine->hasException);
-
-    QVERIFY(result->as<QV4::ArrayObject>());
-}
-
-QTEST_MAIN(tst_v4traced)
-
-#include "tst_v4traced.moc"
diff --git a/tests/auto/qml/v4traced/v4traced.pro b/tests/auto/qml/v4traced/v4traced.pro
deleted file mode 100644
index cbc8f38046..0000000000
--- a/tests/auto/qml/v4traced/v4traced.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG += testcase
-TARGET = tst_v4traced
-macos:CONFIG -= app_bundle
-QT += core-private qml-private testlib
-SOURCES  += tst_v4traced.cpp
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 \
diff --git a/tests/auto/quickwidgets/qquickwidget/BLACKLIST b/tests/auto/quickwidgets/qquickwidget/BLACKLIST
new file mode 100644
index 0000000000..18ea65bb72
--- /dev/null
+++ b/tests/auto/quickwidgets/qquickwidget/BLACKLIST
@@ -0,0 +1,3 @@
+[tabKey]
+opensuse-42.3
+opensuse-leap
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp
index 189398f0c2..96876428f6 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/shared/util.cpp
@@ -40,7 +40,9 @@ QQmlDataTest::QQmlDataTest() :
     m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0)),
 #endif
 
-    m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/')))
+    m_dataDirectoryUrl(m_dataDirectory.startsWith(QLatin1Char(':'))
+        ? QUrl(QLatin1String("qrc") + m_dataDirectory)
+        : QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/')))
 {
     m_instance = this;
 }
@@ -54,7 +56,8 @@ void QQmlDataTest::initTestCase()
 {
     QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found");
     m_directory = QFileInfo(m_dataDirectory).absolutePath();
-    QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory));
+    if (m_dataDirectoryUrl.scheme() != QLatin1String("qrc"))
+        QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory));
 }
 
 QString QQmlDataTest::testFile(const QString &fileName) const
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri
index a05af4773d..b54897ac2c 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/shared/util.pri
@@ -3,4 +3,8 @@ INCLUDEPATH += $$PWD
 HEADERS += $$PWD/util.h
 SOURCES += $$PWD/util.cpp
 
-DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\"
+android|ios {
+    DEFINES += QT_QMLTEST_DATADIR=\\\":/data\\\"
+} else {
+    DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\"
+}