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

Conflicts:
      examples/quick/shared/LauncherList.qml
      src/quick/items/qquickevents.cpp
      src/quick/items/qquickevents_p_p.h
      src/quick/items/qquickwindow.cpp
      tests/auto/quick/touchmouse/tst_touchmouse.cpp

Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b

36 files changed, 729 insertions, 88 deletions

diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index b6742b9efe..d35a2e971a 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -86,6 +86,8 @@ tst_examples::tst_examples()
     excludedDirs << "snippets/qml/visualdatamodel_rootindex";
     excludedDirs << "snippets/qml/qtbinding";
     excludedDirs << "snippets/qml/imports";
+    excludedFiles << "examples/quick/shapes/content/pathitem.qml"; // relies on resources
+    excludedFiles << "examples/quick/shapes/content/pathiteminteract.qml"; // relies on resources
 
 #ifdef QT_NO_XMLPATTERNS
     excludedDirs << "demos/twitter";
diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp
index 64ddf79255..09a3c36b6d 100644
--- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp
+++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp
@@ -109,7 +109,7 @@ void tst_MptaInterop::touchDrag()
     QPoint p1 = mpta->mapToScene(QPointF(20, 20)).toPoint();
     touch.press(1, p1).commit();
     QQuickTouchUtils::flush(window);
-    auto pointerEvent = touchPointerDevice->pointerEvent();
+    auto pointerEvent = QQuickWindowPrivate::get(window)->pointerEventInstance(touchPointerDevice);
     QCOMPARE(tp.at(0)->property("pressed").toBool(), false);
 //    QCOMPARE(pointerEvent->point(0)->exclusiveGrabber(), mpta);
 
@@ -151,9 +151,7 @@ void tst_MptaInterop::touchesThenPinch()
     QSignalSpy mptaPressedSpy(mpta, SIGNAL(pressed(QList<QObject*>)));
     QSignalSpy mptaReleasedSpy(mpta, SIGNAL(released(QList<QObject*>)));
     QTest::QTouchEventSequence touch = QTest::touchEvent(window, touchDevice);
-    auto pointerEvent = touchPointerDevice->pointerEvent();
-    // TODO after merge of e0c30279ec1fad88346ed3fb483bc3c672fdd01b
-//    auto pointerEvent = QQuickWindowPrivate::pointerEventInstance(touchPointerDevice);
+    auto pointerEvent = QQuickWindowPrivate::get(window)->pointerEventInstance(touchPointerDevice);
 
     // Press one touchpoint:
     // DragHandler gets a passive grab
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
index 18369abec7..bb4361255c 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
@@ -318,7 +318,7 @@ void tst_PointerHandlers::touchEventDelivery()
     QCOMPARE(eventItem1->eventList.size(), 2);
     QCOMPARE_EVENT(0, Event::HandlerDestination, QEvent::Pointer, Qt::TouchPointPressed, NoGrab);
     QCOMPARE_EVENT(1, Event::TouchDestination, QEvent::TouchBegin, Qt::TouchPointPressed, QQuickEventPoint::GrabExclusive);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
+    auto pointerEvent = QQuickWindowPrivate::get(window)->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
     QCOMPARE(pointerEvent->point(0)->exclusiveGrabber(), eventItem1);
     p1 += QPoint(10, 0);
     QTest::touchEvent(window, touchDevice).move(0, p1, window);
diff --git a/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml b/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
index 18a8f52661..c81a765c7e 100644
--- a/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
+++ b/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml b/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
index bfd475266e..bd3b42b397 100644
--- a/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
+++ b/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickapplication/BLACKLIST b/tests/auto/quick/qquickapplication/BLACKLIST
deleted file mode 100644
index 81592db56f..0000000000
--- a/tests/auto/quick/qquickapplication/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[active]
-osx-10.11
diff --git a/tests/auto/quick/qquickapplication/data/tst_platformname.qml b/tests/auto/quick/qquickapplication/data/tst_platformname.qml
new file mode 100644
index 0000000000..1bcd66ac8d
--- /dev/null
+++ b/tests/auto/quick/qquickapplication/data/tst_platformname.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0;
+
+Item {
+    id: root;
+    property string platformName: Qt.platform.pluginName
+}
diff --git a/tests/auto/quick/qquickapplication/qquickapplication.pro b/tests/auto/quick/qquickapplication/qquickapplication.pro
index c47f5472b7..00b5bb3a18 100644
--- a/tests/auto/quick/qquickapplication/qquickapplication.pro
+++ b/tests/auto/quick/qquickapplication/qquickapplication.pro
@@ -3,7 +3,8 @@ TARGET = tst_qquickapplication
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qquickapplication.cpp
-OTHER_FILES += data/tst_displayname.qml
+OTHER_FILES += data/tst_displayname.qml \
+    data/tst_platformname.qml
 
 include (../../shared/util.pri)
 
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index d780b91260..e428a1fc6e 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -53,6 +53,7 @@ private slots:
     void styleHints();
     void cleanup();
     void displayName();
+    void platformName();
 
 private:
     QQmlEngine engine;
@@ -264,6 +265,24 @@ void tst_qquickapplication::displayName()
     QCOMPARE(QGuiApplication::applicationDisplayName(), name[2]);
 }
 
+void tst_qquickapplication::platformName()
+{
+    // Set up QML component
+    QQmlComponent component(&engine, testFileUrl("tst_platformname.qml"));
+    QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
+    QVERIFY(item);
+    QQuickView view;
+    item->setParentItem(view.rootObject());
+
+    // Get native platform name
+    QString guiApplicationPlatformName = QGuiApplication::platformName();
+    QVERIFY(!guiApplicationPlatformName.isEmpty());
+
+    // Get platform name from QML component and verify it's same
+    QString qmlPlatformName = qvariant_cast<QString>(item->property("platformName"));
+    QCOMPARE(qmlPlatformName, guiApplicationPlatformName);
+}
+
 QTEST_MAIN(tst_qquickapplication)
 
 #include "tst_qquickapplication.moc"
diff --git a/tests/auto/quick/qquickfocusscope/BLACKLIST b/tests/auto/quick/qquickfocusscope/BLACKLIST
new file mode 100644
index 0000000000..cc3c8b6e8a
--- /dev/null
+++ b/tests/auto/quick/qquickfocusscope/BLACKLIST
@@ -0,0 +1,2 @@
+[canvasFocus]
+osx-10.11
diff --git a/tests/auto/quick/qquickgridview/data/releaseItems.qml b/tests/auto/quick/qquickgridview/data/releaseItems.qml
new file mode 100644
index 0000000000..19d58550a4
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/releaseItems.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+GridView {
+    width: 400
+    height: 400
+    model: 100
+    delegate: Rectangle {
+        height: 100; width: 100
+        color: index % 2 ? "lightsteelblue" : "lightgray"
+    }
+    contentHeight: contentItem.children.length * 40
+}
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 1acc36c9b0..b2d6584701 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -209,6 +209,7 @@ private slots:
     void QTBUG_48870_fastModelUpdates();
 
     void keyNavigationEnabled();
+    void releaseItems();
 
 private:
     QList<int> toIntList(const QVariantList &list);
@@ -6666,6 +6667,18 @@ void tst_QQuickGridView::QTBUG_48870_fastModelUpdates()
     }
 }
 
+void tst_QQuickGridView::releaseItems()
+{
+    QScopedPointer<QQuickView> view(createView());
+    view->setSource(testFileUrl("releaseItems.qml"));
+
+    QQuickGridView *gridview = qobject_cast<QQuickGridView *>(view->rootObject());
+    QVERIFY(gridview);
+
+    // don't crash (QTBUG-61294)
+    gridview->setModel(123);
+}
+
 QTEST_MAIN(tst_QQuickGridView)
 
 #include "tst_qquickgridview.moc"
diff --git a/tests/auto/quick/qquickitem/data/childAtRectangle.qml b/tests/auto/quick/qquickitem/data/childAtRectangle.qml
index d459c2b3f1..2aaaedb06f 100644
--- a/tests/auto/quick/qquickitem/data/childAtRectangle.qml
+++ b/tests/auto/quick/qquickitem/data/childAtRectangle.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickitem/data/shortcutOverride.qml b/tests/auto/quick/qquickitem/data/shortcutOverride.qml
index fab9175c17..247b5fea04 100644
--- a/tests/auto/quick/qquickitem/data/shortcutOverride.qml
+++ b/tests/auto/quick/qquickitem/data/shortcutOverride.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickitem2/data/nonexistentPropertyConnection.qml b/tests/auto/quick/qquickitem2/data/nonexistentPropertyConnection.qml
new file mode 100644
index 0000000000..ed0632a68a
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/nonexistentPropertyConnection.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.4
+
+Item {
+    function hint() {
+    }
+
+    Connections {
+        target: BlaBlaBla
+        onHint: hint();
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index cc74b7e07d..09e89ff85f 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -98,6 +98,7 @@ private slots:
     void mapCoordinatesRect();
     void mapCoordinatesRect_data();
     void propertyChanges();
+    void nonexistentPropertyConnection();
     void transforms();
     void transforms_data();
     void childrenRect();
@@ -2612,6 +2613,15 @@ void tst_QQuickItem::propertyChanges()
     delete window;
 }
 
+void tst_QQuickItem::nonexistentPropertyConnection()
+{
+    // QTBUG-56551: don't crash
+    QQmlComponent component(&engine, testFileUrl("nonexistentPropertyConnection.qml"));
+    QObject *o = component.create();
+    QVERIFY(o);
+    delete o;
+}
+
 void tst_QQuickItem::childrenRect()
 {
     QQuickView *window = new QQuickView(0);
diff --git a/tests/auto/quick/qquicklistview/data/releaseItems.qml b/tests/auto/quick/qquicklistview/data/releaseItems.qml
new file mode 100644
index 0000000000..de774e5e08
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/releaseItems.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+ListView {
+    width: 400
+    height: 400
+    model: 100
+    delegate: Rectangle {
+        height: 40; width: 400
+        color: index % 2 ? "lightsteelblue" : "lightgray"
+    }
+    contentHeight: contentItem.children.length * 40
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index ff06c1e1a4..98c628068d 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -254,6 +254,7 @@ private slots:
     void keyNavigationEnabled();
     void QTBUG_50097_stickyHeader_positionViewAtIndex();
     void itemFiltered();
+    void releaseItems();
 
 private:
     template <class T> void items(const QUrl &source);
@@ -8508,6 +8509,18 @@ void tst_QQuickListView::itemFiltered()
     model.setData(model.index(2), QStringLiteral("modified three"), Qt::DisplayRole);
 }
 
+void tst_QQuickListView::releaseItems()
+{
+    QScopedPointer<QQuickView> view(createView());
+    view->setSource(testFileUrl("releaseItems.qml"));
+
+    QQuickListView *listview = qobject_cast<QQuickListView *>(view->rootObject());
+    QVERIFY(listview);
+
+    // don't crash (QTBUG-61294)
+    listview->setModel(123);
+}
+
 QTEST_MAIN(tst_QQuickListView)
 
 #include "tst_qquicklistview.moc"
diff --git a/tests/auto/quick/qquickrectangle/data/gradient-multiple.qml b/tests/auto/quick/qquickrectangle/data/gradient-multiple.qml
new file mode 100644
index 0000000000..d58c857008
--- /dev/null
+++ b/tests/auto/quick/qquickrectangle/data/gradient-multiple.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+
+Item {
+    property alias firstRectangle: r1
+    property alias secondRectangle: r2
+    Rectangle {
+        id: r1
+        gradient: someObject.someGradient
+        anchors.fill: parent
+    }
+    Rectangle {
+        id: r2
+        gradient: someObject.someGradient
+        anchors.fill: parent
+    }
+
+    function changeGradient() {
+        firstStop.color = "red"
+        secondStop.color = "blue"
+    }
+
+    QtObject {
+        id: someObject
+        property Gradient someGradient: Gradient {
+            GradientStop { id: firstStop; position: 0.0; color: "gray" }
+            GradientStop { id: secondStop; position: 1.0; color: "white" }
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qquickrectangle/data/gradient-separate.qml b/tests/auto/quick/qquickrectangle/data/gradient-separate.qml
new file mode 100644
index 0000000000..8ae3f3296b
--- /dev/null
+++ b/tests/auto/quick/qquickrectangle/data/gradient-separate.qml
@@ -0,0 +1,20 @@
+import QtQuick 2.0
+
+Rectangle {
+
+    function changeGradient() {
+        firstStop.color = "red"
+        secondStop.color = "blue"
+    }
+
+    QtObject {
+        id: someObject
+        property Gradient someGradient: Gradient {
+            GradientStop { id: firstStop; position: 0.0; color: "gray" }
+            GradientStop { id: secondStop; position: 1.0; color: "white" }
+        }
+    }
+
+    gradient: someObject.someGradient
+}
+
diff --git a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
index 65c7e387a0..0d79592e37 100644
--- a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
+++ b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
@@ -32,6 +32,7 @@
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuick/qquickview.h>
+#include <private/qquickitem_p.h>
 #include <private/qquickrectangle_p.h>
 
 #include "../../shared/util.h"
@@ -46,6 +47,8 @@ private slots:
     void color();
     void gradient();
     void gradient_border();
+    void gradient_separate();
+    void gradient_multiple();
     void antialiasing();
 
 private:
@@ -111,6 +114,62 @@ void tst_qquickrectangle::gradient_border()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 }
 
+// A gradient not defined inline with the Rectangle using it should still change
+// that Rectangle.
+void tst_qquickrectangle::gradient_separate()
+{
+    QQuickView view;
+    view.setSource(testFileUrl("gradient-separate.qml"));
+    view.show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(view.rootObject());
+    QVERIFY(rect);
+
+    // Start off clean
+    QQuickItemPrivate *rectPriv = QQuickItemPrivate::get(rect);
+    bool isDirty = rectPriv->dirtyAttributes & QQuickItemPrivate::Content;
+    QVERIFY(!isDirty);
+
+    QMetaObject::invokeMethod(rect, "changeGradient");
+
+    // Changing the gradient should have scheduled an update of the item.
+    isDirty = rectPriv->dirtyAttributes & QQuickItemPrivate::Content;
+    QVERIFY(isDirty);
+}
+
+// When a gradient is changed, every Rectangle connected to it must update.
+void tst_qquickrectangle::gradient_multiple()
+{
+    QQuickView view;
+    view.setSource(testFileUrl("gradient-multiple.qml"));
+    view.show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    QQuickRectangle *firstRect = qobject_cast<QQuickRectangle*>(view.rootObject()->property("firstRectangle").value<QObject*>());
+    QQuickRectangle *secondRect = qobject_cast<QQuickRectangle*>(view.rootObject()->property("secondRectangle").value<QObject*>());
+    QVERIFY(firstRect);
+    QVERIFY(secondRect);
+
+    // Start off clean
+    QQuickItemPrivate *firstRectPriv = QQuickItemPrivate::get(firstRect);
+    QQuickItemPrivate *secondRectPriv = QQuickItemPrivate::get(secondRect);
+    bool firstIsDirty = firstRectPriv->dirtyAttributes & QQuickItemPrivate::Content;
+    bool secondIsDirty = secondRectPriv->dirtyAttributes & QQuickItemPrivate::Content;
+    QVERIFY(!firstIsDirty);
+    QVERIFY(!secondIsDirty);
+
+    QMetaObject::invokeMethod(view.rootObject(), "changeGradient");
+
+    // Changing the gradient should have scheduled an update of both items
+    firstIsDirty = firstRectPriv->dirtyAttributes & QQuickItemPrivate::Content;
+    secondIsDirty = secondRectPriv->dirtyAttributes & QQuickItemPrivate::Content;
+    QVERIFY(firstIsDirty);
+    QVERIFY(secondIsDirty);
+}
+
 void tst_qquickrectangle::antialiasing()
 {
     QQmlComponent component(&engine);
diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
index 26b687a4a6..0a3796402a 100644
--- a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
+++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
@@ -113,6 +113,9 @@ void tst_qquickscreen::fullScreenList()
         QQuickScreenInfo *info = qobject_cast<QQuickScreenInfo *>(screensArray.property(i).toQObject());
         QVERIFY(info != nullptr);
         QCOMPARE(screenList[i]->name(), info->name());
+        QCOMPARE(screenList[i]->manufacturer(), info->manufacturer());
+        QCOMPARE(screenList[i]->model(), info->model());
+        QCOMPARE(screenList[i]->serialNumber(), info->serialNumber());
         QCOMPARE(screenList[i]->size().width(), info->width());
         QCOMPARE(screenList[i]->size().height(), info->height());
         QCOMPARE(screenList[i]->availableVirtualGeometry().width(), info->desktopAvailableWidth());
diff --git a/tests/auto/quick/qquickshape/data/pathitem1.qml b/tests/auto/quick/qquickshape/data/pathitem1.qml
new file mode 100644
index 0000000000..29ca67b0bb
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem1.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.9
+import tst_qquickpathitem 1.0
+
+Shape {
+}
diff --git a/tests/auto/quick/qquickshape/data/pathitem2.qml b/tests/auto/quick/qquickshape/data/pathitem2.qml
new file mode 100644
index 0000000000..a255a37af6
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem2.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.9
+import tst_qquickpathitem 1.0
+
+Shape {
+    ShapePath { }
+    ShapePath { }
+}
diff --git a/tests/auto/quick/qquickshape/data/pathitem3.png b/tests/auto/quick/qquickshape/data/pathitem3.png
new file mode 100644
index 0000000000..a8b4483c96
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem3.png
diff --git a/tests/auto/quick/qquickshape/data/pathitem3.qml b/tests/auto/quick/qquickshape/data/pathitem3.qml
new file mode 100644
index 0000000000..8328f2fc33
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem3.qml
@@ -0,0 +1,33 @@
+import QtQuick 2.9
+import tst_qquickpathitem 1.0
+
+Item {
+    width: 200
+    height: 150
+
+    Shape {
+        vendorExtensionsEnabled: false
+        objectName: "pathItem"
+        anchors.fill: parent
+
+        ShapePath {
+            strokeWidth: 4
+            strokeColor: "red"
+            fillGradient: LinearGradient {
+                x1: 20; y1: 20
+                x2: 180; y2: 130
+                GradientStop { position: 0; color: "blue" }
+                GradientStop { position: 0.2; color: "green" }
+                GradientStop { position: 0.4; color: "red" }
+                GradientStop { position: 0.6; color: "yellow" }
+                GradientStop { position: 1; color: "cyan" }
+            }
+            strokeStyle: ShapePath.DashLine
+            dashPattern: [ 1, 4 ]
+            startX: 20; startY: 20
+            PathLine { x: 180; y: 130 }
+            PathLine { x: 20; y: 130 }
+            PathLine { x: 20; y: 20 }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickshape/data/pathitem4.png b/tests/auto/quick/qquickshape/data/pathitem4.png
new file mode 100644
index 0000000000..3a988ba249
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem4.png
diff --git a/tests/auto/quick/qquickshape/data/pathitem4.qml b/tests/auto/quick/qquickshape/data/pathitem4.qml
new file mode 100644
index 0000000000..635113416f
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem4.qml
@@ -0,0 +1,56 @@
+import QtQuick 2.9
+import tst_qquickpathitem 1.0
+
+Item {
+    width: 200
+    height: 150
+
+    Shape {
+        vendorExtensionsEnabled: false
+        objectName: "pathItem"
+        anchors.fill: parent
+
+        ShapePath {
+            strokeColor: "red"
+            fillColor: "green"
+            startX: 40; startY: 30
+            PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
+            PathLine { x: 150; y: 80 }
+            PathQuad { x: 160; y: 30; controlX: 200; controlY: 80 }
+        }
+
+        ShapePath {
+            strokeWidth: 10
+            fillColor: "transparent"
+            strokeColor: "blue"
+            startX: 40; startY: 30
+            PathCubic { x: 50; y: 80; control1X: 0; control1Y: 80; control2X: 100; control2Y: 100 }
+        }
+
+        ShapePath {
+            fillGradient: LinearGradient {
+                y2: 150
+                GradientStop { position: 0; color: "yellow" }
+                GradientStop { position: 1; color: "green" }
+            }
+
+            startX: 10; startY: 100
+            PathArc {
+                relativeX: 50; y: 100
+                radiusX: 25; radiusY: 25
+            }
+            PathArc {
+                relativeX: 50; y: 100
+                radiusX: 25; radiusY: 35
+            }
+            PathArc {
+                relativeX: 50; y: 100
+                radiusX: 25; radiusY: 60
+            }
+            PathArc {
+                relativeX: 50; y: 100
+                radiusX: 50; radiusY: 120
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickshape/qquickshape.pro b/tests/auto/quick/qquickshape/qquickshape.pro
new file mode 100644
index 0000000000..29c3502b86
--- /dev/null
+++ b/tests/auto/quick/qquickshape/qquickshape.pro
@@ -0,0 +1,35 @@
+CONFIG += testcase
+TARGET = tst_qquickshape
+macos:CONFIG -= app_bundle
+
+SOURCES += tst_qquickshape.cpp
+
+include (../../shared/util.pri)
+include (../shared/util.pri)
+
+TESTDATA = data/*
+
+HEADERS += \
+    ../../../../src/imports/shapes/qquickshape_p.h \
+    ../../../../src/imports/shapes/qquickshape_p_p.h \
+    ../../../../src/imports/shapes/qquickshapegenericrenderer_p.h \
+    ../../../../src/imports/shapes/qquickshapesoftwarerenderer_p.h
+
+SOURCES += \
+    ../../../../src/imports/shapes/qquickshape.cpp \
+    ../../../../src/imports/shapes/qquickshapegenericrenderer.cpp \
+    ../../../../src/imports/shapes/qquickshapesoftwarerenderer.cpp
+
+qtConfig(opengl) {
+    HEADERS += \
+        ../../../../src/imports/shapes/qquicknvprfunctions_p.h \
+        ../../../../src/imports/shapes/qquicknvprfunctions_p_p.h \
+        ../../../../src/imports/shapes/qquickshapenvprrenderer_p.h
+
+    SOURCES += \
+        ../../../../src/imports/shapes/qquicknvprfunctions.cpp \
+        ../../../../src/imports/shapes/qquickshapenvprrenderer.cpp
+}
+
+QT += core-private gui-private  qml-private quick-private testlib
+qtHaveModule(widgets): QT += widgets
diff --git a/tests/auto/quick/qquickshape/tst_qquickshape.cpp b/tests/auto/quick/qquickshape/tst_qquickshape.cpp
new file mode 100644
index 0000000000..dcc79e6599
--- /dev/null
+++ b/tests/auto/quick/qquickshape/tst_qquickshape.cpp
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** 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 <QtQuick/qquickview.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/qqmlcontext.h>
+#include <QtQml/qqmlexpression.h>
+#include <QtQml/qqmlincubator.h>
+#include "../../../../src/imports/shapes/qquickshape_p.h"
+
+#include "../../shared/util.h"
+#include "../shared/viewtestutil.h"
+#include "../shared/visualtestutil.h"
+
+using namespace QQuickViewTestUtil;
+using namespace QQuickVisualTestUtil;
+
+class tst_QQuickShape : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_QQuickShape();
+
+private slots:
+    void initValues();
+    void vpInitValues();
+    void basicShape();
+    void changeSignals();
+    void render();
+    void renderWithMultipleSp();
+};
+
+tst_QQuickShape::tst_QQuickShape()
+{
+    // Force the software backend to get reliable rendering results regardless of the hw and drivers.
+    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+
+    const char *uri = "tst_qquickpathitem";
+    qmlRegisterType<QQuickShape>(uri, 1, 0, "Shape");
+    qmlRegisterType<QQuickShapePath>(uri, 1, 0, "ShapePath");
+    qmlRegisterUncreatableType<QQuickShapeGradient>(uri, 1, 0, "ShapeGradient", QQuickShapeGradient::tr("ShapeGradient is an abstract base class"));
+    qmlRegisterType<QQuickShapeLinearGradient>(uri, 1, 0, "LinearGradient");
+}
+
+void tst_QQuickShape::initValues()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("pathitem1.qml"));
+    QQuickShape *obj = qobject_cast<QQuickShape *>(c.create());
+
+    QVERIFY(obj != nullptr);
+    QVERIFY(obj->rendererType() == QQuickShape::UnknownRenderer);
+    QVERIFY(!obj->asynchronous());
+    QVERIFY(obj->vendorExtensionsEnabled());
+    QVERIFY(obj->status() == QQuickShape::Null);
+    auto vps = obj->data();
+    QVERIFY(vps.count(&vps) == 0);
+
+    delete obj;
+}
+
+void tst_QQuickShape::vpInitValues()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("pathitem2.qml"));
+    QQuickShape *obj = qobject_cast<QQuickShape *>(c.create());
+
+    QVERIFY(obj != nullptr);
+    QVERIFY(obj->rendererType() == QQuickShape::UnknownRenderer);
+    QVERIFY(!obj->asynchronous());
+    QVERIFY(obj->vendorExtensionsEnabled());
+    QVERIFY(obj->status() == QQuickShape::Null);
+    auto vps = obj->data();
+    QVERIFY(vps.count(&vps) == 2);
+
+    QQuickShapePath *vp = qobject_cast<QQuickShapePath *>(vps.at(&vps, 0));
+    QVERIFY(vp != nullptr);
+    QQmlListReference pathList(vp, "pathElements");
+    QCOMPARE(pathList.count(), 0);
+    QCOMPARE(vp->strokeColor(), QColor(Qt::white));
+    QCOMPARE(vp->strokeWidth(), 1.0f);
+    QCOMPARE(vp->fillColor(), QColor(Qt::white));
+    QCOMPARE(vp->fillRule(), QQuickShapePath::OddEvenFill);
+    QCOMPARE(vp->joinStyle(), QQuickShapePath::BevelJoin);
+    QCOMPARE(vp->miterLimit(), 2);
+    QCOMPARE(vp->capStyle(), QQuickShapePath::SquareCap);
+    QCOMPARE(vp->strokeStyle(), QQuickShapePath::SolidLine);
+    QCOMPARE(vp->dashOffset(), 0.0f);
+    QCOMPARE(vp->dashPattern(), QVector<qreal>() << 4 << 2);
+    QVERIFY(!vp->fillGradient());
+
+    delete obj;
+}
+
+void tst_QQuickShape::basicShape()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("pathitem3.qml"));
+    qApp->processEvents();
+
+    QQuickShape *obj = findItem<QQuickShape>(window->rootObject(), "pathItem");
+    QVERIFY(obj != nullptr);
+    QQmlListReference list(obj, "data");
+    QCOMPARE(list.count(), 1);
+    QQuickShapePath *vp = qobject_cast<QQuickShapePath *>(list.at(0));
+    QVERIFY(vp != nullptr);
+    QCOMPARE(vp->strokeWidth(), 4.0f);
+    QVERIFY(vp->fillGradient() != nullptr);
+    QCOMPARE(vp->strokeStyle(), QQuickShapePath::DashLine);
+
+    vp->setStrokeWidth(5.0f);
+    QCOMPARE(vp->strokeWidth(), 5.0f);
+
+    QQuickShapeLinearGradient *lgrad = qobject_cast<QQuickShapeLinearGradient *>(vp->fillGradient());
+    QVERIFY(lgrad != nullptr);
+    QCOMPARE(lgrad->spread(), QQuickShapeGradient::PadSpread);
+    QCOMPARE(lgrad->x1(), 20.0f);
+    QQmlListReference stopList(lgrad, "stops");
+    QCOMPARE(stopList.count(), 5);
+    QVERIFY(stopList.at(2) != nullptr);
+
+    QQuickPath *path = vp;
+    QCOMPARE(path->startX(), 20.0f);
+    QQmlListReference pathList(path, "pathElements");
+    QCOMPARE(pathList.count(), 3);
+}
+
+void tst_QQuickShape::changeSignals()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("pathitem3.qml"));
+    qApp->processEvents();
+
+    QQuickShape *obj = findItem<QQuickShape>(window->rootObject(), "pathItem");
+    QVERIFY(obj != nullptr);
+
+    QSignalSpy asyncPropSpy(obj, SIGNAL(asynchronousChanged()));
+    obj->setAsynchronous(true);
+    obj->setAsynchronous(false);
+    QCOMPARE(asyncPropSpy.count(), 2);
+
+    QQmlListReference list(obj, "data");
+    QQuickShapePath *vp = qobject_cast<QQuickShapePath *>(list.at(0));
+    QVERIFY(vp != nullptr);
+
+    // Verify that VisualPath property changes emit shapePathChanged().
+    QSignalSpy vpChangeSpy(vp, SIGNAL(shapePathChanged()));
+    QSignalSpy strokeColorPropSpy(vp, SIGNAL(strokeColorChanged()));
+    vp->setStrokeColor(Qt::blue);
+    vp->setStrokeWidth(1.0f);
+    QQuickShapeGradient *g = vp->fillGradient();
+    vp->setFillGradient(nullptr);
+    vp->setFillColor(Qt::yellow);
+    vp->setFillRule(QQuickShapePath::WindingFill);
+    vp->setJoinStyle(QQuickShapePath::MiterJoin);
+    vp->setMiterLimit(5);
+    vp->setCapStyle(QQuickShapePath::RoundCap);
+    vp->setDashOffset(10);
+    vp->setDashPattern(QVector<qreal>() << 1 << 2 << 3 << 4);
+    QCOMPARE(strokeColorPropSpy.count(), 1);
+    QCOMPARE(vpChangeSpy.count(), 10);
+
+    // Verify that property changes from Path and its elements bubble up and result in shapePathChanged().
+    QQuickPath *path = vp;
+    path->setStartX(30);
+    QCOMPARE(vpChangeSpy.count(), 11);
+    QQmlListReference pathList(path, "pathElements");
+    qobject_cast<QQuickPathLine *>(pathList.at(1))->setY(200);
+    QCOMPARE(vpChangeSpy.count(), 12);
+
+    // Verify that property changes from the gradient bubble up and result in shapePathChanged().
+    vp->setFillGradient(g);
+    QCOMPARE(vpChangeSpy.count(), 13);
+    QQuickShapeLinearGradient *lgrad = qobject_cast<QQuickShapeLinearGradient *>(g);
+    lgrad->setX2(200);
+    QCOMPARE(vpChangeSpy.count(), 14);
+    QQmlListReference stopList(lgrad, "stops");
+    QCOMPARE(stopList.count(), 5);
+    qobject_cast<QQuickGradientStop *>(stopList.at(1))->setPosition(0.3);
+    QCOMPARE(vpChangeSpy.count(), 15);
+    qobject_cast<QQuickGradientStop *>(stopList.at(1))->setColor(Qt::black);
+    QCOMPARE(vpChangeSpy.count(), 16);
+}
+
+void tst_QQuickShape::render()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("pathitem3.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QImage img = window->grabWindow();
+    QVERIFY(!img.isNull());
+
+    QImage refImg(testFileUrl("pathitem3.png").toLocalFile());
+    QVERIFY(!refImg.isNull());
+
+    QVERIFY(QQuickVisualTestUtil::compareImages(img.convertToFormat(refImg.format()), refImg));
+}
+
+void tst_QQuickShape::renderWithMultipleSp()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("pathitem4.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QImage img = window->grabWindow();
+    QVERIFY(!img.isNull());
+
+    QImage refImg(testFileUrl("pathitem4.png").toLocalFile());
+    QVERIFY(!refImg.isNull());
+
+    QVERIFY(QQuickVisualTestUtil::compareImages(img.convertToFormat(refImg.format()), refImg));
+}
+
+QTEST_MAIN(tst_QQuickShape)
+
+#include "tst_qquickshape.moc"
diff --git a/tests/auto/quick/qquickview/data/findChild.qml b/tests/auto/quick/qquickview/data/findChild.qml
new file mode 100644
index 0000000000..8cbc46abe2
--- /dev/null
+++ b/tests/auto/quick/qquickview/data/findChild.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+Item {
+    width: 200
+    height: 200
+    objectName: "rootObject"
+    Item {
+        objectName: "rootObjectChild"
+    }
+}
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index fa9192edb4..04d21457e6 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -70,6 +70,7 @@ private slots:
     void resizemodeitem();
     void errors();
     void engine();
+    void findChild();
 };
 
 
@@ -265,6 +266,45 @@ void tst_QQuickView::engine()
     delete view4;
 }
 
+void tst_QQuickView::findChild()
+{
+    QQuickView view;
+    view.setSource(testFileUrl("findChild.qml"));
+
+    // QQuickView
+    // |_ QQuickWindow::contentItem
+    // |  |_ QQuickView::rootObject: QML Item("rootObject") (findChild.qml)
+    // |  |  |_ QML Item("rootObjectChild") (findChild.qml)
+    // |  |_ QObject("contentItemChild")
+    // |_ QObject("viewChild")
+
+    QObject *viewChild = new QObject(&view);
+    viewChild->setObjectName("viewChild");
+
+    QObject *contentItemChild = new QObject(view.contentItem());
+    contentItemChild->setObjectName("contentItemChild");
+
+    QObject *rootObject = view.rootObject();
+    QVERIFY(rootObject);
+
+    QObject *rootObjectChild = rootObject->findChild<QObject *>("rootObjectChild");
+    QVERIFY(rootObjectChild);
+
+    QCOMPARE(view.findChild<QObject *>("viewChild"), viewChild);
+    QCOMPARE(view.findChild<QObject *>("contentItemChild"), contentItemChild);
+    QCOMPARE(view.findChild<QObject *>("rootObject"), rootObject);
+    QCOMPARE(view.findChild<QObject *>("rootObjectChild"), rootObjectChild);
+
+    QVERIFY(!view.contentItem()->findChild<QObject *>("viewChild")); // sibling
+    QCOMPARE(view.contentItem()->findChild<QObject *>("contentItemChild"), contentItemChild);
+    QCOMPARE(view.contentItem()->findChild<QObject *>("rootObject"), rootObject);
+    QCOMPARE(view.contentItem()->findChild<QObject *>("rootObjectChild"), rootObjectChild);
+
+    QVERIFY(!view.rootObject()->findChild<QObject *>("viewChild")); // ancestor
+    QVERIFY(!view.rootObject()->findChild<QObject *>("contentItemChild")); // cousin
+    QVERIFY(!view.rootObject()->findChild<QObject *>("rootObject")); // self
+}
+
 QTEST_MAIN(tst_QQuickView)
 
 #include "tst_qquickview.moc"
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
deleted file mode 100644
index 157808fdbf..0000000000
--- a/tests/auto/quick/qquickwindow/BLACKLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-[requestActivate]
-osx-10.11
-[attachedProperty]
-osx-10.11
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 4fea13eb49..0c341b2663 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -388,6 +388,8 @@ private slots:
 
     void testDragEventPropertyPropagation();
 
+    void findChild();
+
 private:
     QTouchDevice *touchDevice;
     QTouchDevice *touchDeviceWithVelocity;
@@ -2875,6 +2877,28 @@ void tst_qquickwindow::testDragEventPropertyPropagation()
     }
 }
 
+void tst_qquickwindow::findChild()
+{
+    QQuickWindow window;
+
+    // QQuickWindow
+    // |_ QQuickWindow::contentItem
+    // |  |_ QObject("contentItemChild")
+    // |_ QObject("viewChild")
+
+    QObject *windowChild = new QObject(&window);
+    windowChild->setObjectName("windowChild");
+
+    QObject *contentItemChild = new QObject(window.contentItem());
+    contentItemChild->setObjectName("contentItemChild");
+
+    QCOMPARE(window.findChild<QObject *>("windowChild"), windowChild);
+    QCOMPARE(window.findChild<QObject *>("contentItemChild"), contentItemChild);
+
+    QVERIFY(!window.contentItem()->findChild<QObject *>("viewChild")); // sibling
+    QCOMPARE(window.contentItem()->findChild<QObject *>("contentItemChild"), contentItemChild);
+}
+
 QTEST_MAIN(tst_qquickwindow)
 
 #include "tst_qquickwindow.moc"
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 99bd329f8e..9b7740646a 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -70,6 +70,7 @@ QUICKTESTS =  \
     qquickmousearea \
     qquickmultipointtoucharea \
     qquickpainteditem \
+    qquickshape \
     qquickpathview \
     qquickpincharea \
     qquickpositioners \
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 01aa5d1c8e..646317078b 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -590,7 +590,7 @@ void tst_TouchMouse::buttonOnFlickable()
 
     QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window.data());
     QVERIFY(windowPriv->touchMouseId != -1);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
+    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
     QCOMPARE(pointerEvent->point(0)->exclusiveGrabber(), eventItem1);
     QCOMPARE(window->mouseGrabberItem(), eventItem1);
 
@@ -651,7 +651,7 @@ void tst_TouchMouse::touchButtonOnFlickable()
 
     QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window.data());
     QVERIFY(windowPriv->touchMouseId == -1);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
+    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
     QCOMPARE(pointerEvent->point(0)->grabberItem(), eventItem2);
     QCOMPARE(window->mouseGrabberItem(), nullptr);
 
@@ -777,8 +777,8 @@ void tst_TouchMouse::buttonOnDelayedPressFlickable()
     // for the touchMouseId to the new grabber.
     QCOMPARE(window->mouseGrabberItem(), flickable);
     QVERIFY(windowPriv->touchMouseId != -1);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
-    QCOMPARE(pointerEvent->point(0)->exclusiveGrabber(), flickable);
+    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
+    QCOMPARE(pointerEvent->point(0)->grabberItem(), flickable);
 
     QTest::touchEvent(window.data(), device).release(0, p3, window.data());
     QQuickTouchUtils::flush(window.data());
@@ -1441,7 +1441,6 @@ void tst_TouchMouse::hoverEnabled()
     QSignalSpy exitSpy2(mouseArea2, SIGNAL(exited()));
     QSignalSpy clickSpy2(mouseArea2, SIGNAL(clicked(QQuickMouseEvent *)));
 
-    QPoint p0(50, 50);
     QPoint p1(150, 150);
     QPoint p2(150, 250);
 
@@ -1467,9 +1466,6 @@ void tst_TouchMouse::hoverEnabled()
     QVERIFY(!mouseArea2->hovered());
 
     // ------------------------- Touch click on mouseArea2
-    if (QGuiApplication::platformName().compare(QLatin1String("xcb"), Qt::CaseInsensitive) == 0)
-        QSKIP("hover can be momentarily inconsistent on X11, depending on timing of flushFrameSynchronousEvents with touch and mouse movements (QTBUG-55350)");
-
     QTest::touchEvent(window.data(), device).press(0, p2, window.data());
 
     QVERIFY(mouseArea1->hovered());