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

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

53 files changed, 723 insertions, 458 deletions

diff --git a/src/quick/items/checksync.pl b/src/quick/items/checksync.pl
deleted file mode 100755
index c9771bb10c..0000000000
--- a/src/quick/items/checksync.pl
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/perl
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Declarative module of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## 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 Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## 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-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-use strict;
-use warnings;
-
-die "Usage: $0 <QML directory>" if (@ARGV != 1);
-
-my @excludes;
-open (SYNCEXCLUDES, "<", "syncexcludes");
-while (<SYNCEXCLUDES>) {
-    if (/^([a-zA-Z0-9\._]+)/) {
-        my $exclude = $1;
-        push (@excludes, $exclude);
-    }
-}
-
-my $portdir = ".";
-my $qmldir = $ARGV[0];
-
-opendir (PORTDIR, $portdir) or die "Cannot open port directory";
-opendir (QMLDIR, $qmldir) or die "Cannot open QML directory";
-
-my @portfiles = readdir(PORTDIR);
-my @qmlfiles = readdir(QMLDIR);
-
-closedir(PORTDIR);
-closedir(QMLDIR);
-
-foreach my $qmlfile (@qmlfiles) {
-    if ($qmlfile =~ /^qdeclarative.*\.cpp$/ or $qmlfile =~ /qdeclarative.*\.h$/) {
-
-        if (grep { $_ eq $qmlfile} @excludes) {
-            next;
-        }
-
-        my $portfile = $qmlfile;
-        $portfile =~ s/^qdeclarative/qsg/;
-
-        if (grep { $_ eq $portfile} @portfiles) {
-
-            open (PORTFILE, "<", "$portdir/$portfile") or die("Cannot open $portdir/$portfile for reading");
-
-            my $firstline = <PORTFILE>;
-
-            close (PORTFILE);
-
-            if ($firstline and $firstline =~ /^\/\/ Commit: ([a-z0-9]+)/) {
-                my $sha1 = $1;
-                my $commitSha1 = "";
-
-                my $output = `cd $qmldir; git log $qmlfile | head -n 1`;
-                if ($output =~ /commit ([a-z0-9]+)/) {
-                    $commitSha1 = $1;
-                }
-
-                if ($commitSha1 eq $sha1) {
-                    print ("$portfile: OK\n");
-                } else {
-                    print ("$portfile: OUT OF DATE\n");
-                }
-            } else {
-                print ("$portfile: OUT OF DATE\n");
-            }
-        } else {
-            print ("$portfile: MISSING\n");
-        }
-    }
-}
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 78db92ba8a..b772ed97d2 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -354,7 +354,7 @@ void QQuickCanvasItem::setContextType(const QString &contextType)
         return;
 
     if (d->context) {
-        qmlInfo(this) << "Canvas already initialized with a different context type";
+        qmlWarning(this) << "Canvas already initialized with a different context type";
         return;
     }
 
@@ -517,7 +517,7 @@ void QQuickCanvasItem::setRenderTarget(QQuickCanvasItem::RenderTarget target)
     Q_D(QQuickCanvasItem);
     if (d->renderTarget != target) {
         if (d->context) {
-            qmlInfo(this) << "Canvas:renderTarget not changeble once context is active.";
+            qmlWarning(this) << "Canvas:renderTarget not changeble once context is active.";
             return;
         }
 
@@ -561,7 +561,7 @@ void QQuickCanvasItem::setRenderStrategy(QQuickCanvasItem::RenderStrategy strate
     Q_D(QQuickCanvasItem);
     if (d->renderStrategy != strategy) {
         if (d->context) {
-            qmlInfo(this) << "Canvas:renderStrategy not changeable once context is active.";
+            qmlWarning(this) << "Canvas:renderStrategy not changeable once context is active.";
             return;
         }
         d->renderStrategy = strategy;
@@ -766,7 +766,6 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     if (!texture) {
         delete node;
         d->node = 0;
-        delete d->nodeTexture;
         d->nodeTexture = 0;
         if (d->textureProvider) {
             d->textureProvider->tex = 0;
@@ -840,13 +839,13 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedString str(scope, (*args)[0]);
     if (!str) {
-        qmlInfo(this) << "getContext should be called with a string naming the required context type";
+        qmlWarning(this) << "getContext should be called with a string naming the required context type";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
 
     if (!d->available) {
-        qmlInfo(this) << "Unable to use getContext() at this time, please wait for available: true";
+        qmlWarning(this) << "Unable to use getContext() at this time, please wait for available: true";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -859,7 +858,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args)
             return;
         }
 
-        qmlInfo(this) << "Canvas already initialized with a different context type";
+        qmlWarning(this) << "Canvas already initialized with a different context type";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -882,7 +881,7 @@ void QQuickCanvasItem::requestAnimationFrame(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedFunctionObject f(scope, (*args)[0]);
     if (!f) {
-        qmlInfo(this) << "requestAnimationFrame should be called with an animation callback function";
+        qmlWarning(this) << "requestAnimationFrame should be called with an animation callback function";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
@@ -910,7 +909,7 @@ void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedValue v(scope, (*args)[0]);
     if (!v->isInteger()) {
-        qmlInfo(this) << "cancelRequestAnimationFrame should be called with an animation callback id";
+        qmlWarning(this) << "cancelRequestAnimationFrame should be called with an animation callback id";
         args->setReturnValue(QV4::Encode::null());
         return;
     }
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index 4162314cd3..c0bec7d716 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -214,7 +214,7 @@ void QQuickAnchorsPrivate::fillChanged()
         --updatingFill;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on fill.");
+        qmlWarning(item) << QQuickAnchors::tr("Possible anchor loop detected on fill.");
     }
 
 }
@@ -243,7 +243,7 @@ void QQuickAnchorsPrivate::centerInChanged()
         --updatingCenterIn;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on centerIn.");
+        qmlWarning(item) << QQuickAnchors::tr("Possible anchor loop detected on centerIn.");
     }
 }
 
@@ -529,7 +529,7 @@ void QQuickAnchors::setFill(QQuickItem *f)
         return;
     }
     if (f != readParentItem(d->item) && readParentItem(f) != readParentItem(d->item)){
-        qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
+        qmlWarning(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
         return;
     }
     QQuickItem *oldFill = d->fill;
@@ -565,7 +565,7 @@ void QQuickAnchors::setCenterIn(QQuickItem* c)
         return;
     }
     if (c != readParentItem(d->item) && readParentItem(c) != readParentItem(d->item)){
-        qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
+        qmlWarning(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
         return;
     }
     QQuickItem *oldCI = d->centerIn;
@@ -619,7 +619,7 @@ void QQuickAnchorsPrivate::updateVerticalAnchors()
 
     if (Q_UNLIKELY(updatingVerticalAnchor > 1)) {
         // ### Make this certain :)
-        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on vertical anchor.");
+        qmlWarning(item) << QQuickAnchors::tr("Possible anchor loop detected on vertical anchor.");
         return;
     }
 
@@ -794,7 +794,7 @@ void QQuickAnchorsPrivate::updateHorizontalAnchors()
         --updatingHorizontalAnchor;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on horizontal anchor.");
+        qmlWarning(item) << QQuickAnchors::tr("Possible anchor loop detected on horizontal anchor.");
     }
 }
 
@@ -1329,7 +1329,7 @@ bool QQuickAnchorsPrivate::checkHValid() const
     if (usedAnchors & QQuickAnchors::LeftAnchor &&
         usedAnchors & QQuickAnchors::RightAnchor &&
         usedAnchors & QQuickAnchors::HCenterAnchor) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot specify left, right, and horizontalCenter anchors at the same time.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot specify left, right, and horizontalCenter anchors at the same time.");
         return false;
     }
 
@@ -1339,17 +1339,17 @@ bool QQuickAnchorsPrivate::checkHValid() const
 bool QQuickAnchorsPrivate::checkHAnchorValid(QQuickAnchorLine anchor) const
 {
     if (!anchor.item) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to a null item.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor to a null item.");
         return false;
     } else if (anchor.anchorLine & QQuickAnchors::Vertical_Mask) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
         return false;
     } else if (anchor.item != readParentItem(item)
                && readParentItem(anchor.item) != readParentItem(item)) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
         return false;
     } else if (anchor.item == item) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor item to self.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor item to self.");
         return false;
     }
 
@@ -1361,13 +1361,13 @@ bool QQuickAnchorsPrivate::checkVValid() const
     if (usedAnchors & QQuickAnchors::TopAnchor &&
         usedAnchors & QQuickAnchors::BottomAnchor &&
         usedAnchors & QQuickAnchors::VCenterAnchor) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot specify top, bottom, and verticalCenter anchors at the same time.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot specify top, bottom, and verticalCenter anchors at the same time.");
         return false;
     } else if (usedAnchors & QQuickAnchors::BaselineAnchor &&
                (usedAnchors & QQuickAnchors::TopAnchor ||
                 usedAnchors & QQuickAnchors::BottomAnchor ||
                 usedAnchors & QQuickAnchors::VCenterAnchor)) {
-        qmlInfo(item) << QQuickAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or verticalCenter anchors.");
+        qmlWarning(item) << QQuickAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or verticalCenter anchors.");
         return false;
     }
 
@@ -1377,17 +1377,17 @@ bool QQuickAnchorsPrivate::checkVValid() const
 bool QQuickAnchorsPrivate::checkVAnchorValid(QQuickAnchorLine anchor) const
 {
     if (!anchor.item) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to a null item.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor to a null item.");
         return false;
     } else if (anchor.anchorLine & QQuickAnchors::Horizontal_Mask) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
         return false;
     } else if (anchor.item != readParentItem(item)
                && readParentItem(anchor.item) != readParentItem(item)) {
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
         return false;
     } else if (anchor.item == item){
-        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor item to self.");
+        qmlWarning(item) << QQuickAnchors::tr("Cannot anchor item to self.");
         return false;
     }
 
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 81c649dbd5..a1833081c8 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -371,7 +371,7 @@ void QQuickAnimatedImage::movieRequestFinished()
 #endif
 
     if (!d->_movie->isValid()) {
-        qmlInfo(this) << "Error Reading Animated Image File " << d->url.toString();
+        qmlWarning(this) << "Error Reading Animated Image File " << d->url.toString();
         delete d->_movie;
         d->_movie = 0;
         d->setImage(QImage());
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index 8aeef4ef4a..76c2146ddb 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -626,7 +626,7 @@ QSGSpriteNode* QQuickAnimatedSprite::initNode()
     Q_D(QQuickAnimatedSprite);
 
     if (!d->m_spriteEngine) {
-        qmlInfo(this) << "No sprite engine...";
+        qmlWarning(this) << "No sprite engine...";
         return nullptr;
     } else if (d->m_spriteEngine->status() == QQuickPixmap::Null) {
         d->m_spriteEngine->startAssemblingImage();
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 67b99bfbc6..28d834f9e2 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -515,7 +515,7 @@ void QQuickBorderImage::requestFinished()
     QSize impsize = d->pix.implicitSize();
     if (d->pix.isError()) {
         d->status = Error;
-        qmlInfo(this) << d->pix.error();
+        qmlWarning(this) << d->pix.error();
         if (d->progress != 0) {
             d->progress = 0;
             emit progressChanged(d->progress);
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 7a112e840a..e5969eed7f 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -307,7 +307,7 @@ void QQuickDragAttached::setActive(bool active)
     Q_D(QQuickDragAttached);
     if (d->active != active) {
         if (d->inEvent)
-            qmlInfo(this) << "active cannot be changed from within a drag event handler";
+            qmlWarning(this) << "active cannot be changed from within a drag event handler";
         else if (active) {
             if (d->dragType == QQuickDrag::Internal) {
                 d->start(d->supportedActions);
@@ -629,7 +629,7 @@ void QQuickDragAttached::start(QQmlV4Function *args)
 {
     Q_D(QQuickDragAttached);
     if (d->inEvent) {
-        qmlInfo(this) << "start() cannot be called from within a drag event handler";
+        qmlWarning(this) << "start() cannot be called from within a drag event handler";
         return;
     }
 
@@ -675,7 +675,7 @@ int QQuickDragAttached::drop()
     Qt::DropAction acceptedAction = Qt::IgnoreAction;
 
     if (d->inEvent) {
-        qmlInfo(this) << "drop() cannot be called from within a drag event handler";
+        qmlWarning(this) << "drop() cannot be called from within a drag event handler";
         return acceptedAction;
     }
 
@@ -722,7 +722,7 @@ void QQuickDragAttached::cancel()
     Q_D(QQuickDragAttached);
 
     if (d->inEvent) {
-        qmlInfo(this) << "cancel() cannot be called from within a drag event handler";
+        qmlWarning(this) << "cancel() cannot be called from within a drag event handler";
         return;
     }
 
@@ -809,12 +809,12 @@ void QQuickDragAttached::startDrag(QQmlV4Function *args)
     Q_D(QQuickDragAttached);
 
     if (d->inEvent) {
-        qmlInfo(this) << "startDrag() cannot be called from within a drag event handler";
+        qmlWarning(this) << "startDrag() cannot be called from within a drag event handler";
         return;
     }
 
     if (!d->active) {
-        qmlInfo(this) << "startDrag() drag must be active";
+        qmlWarning(this) << "startDrag() drag must be active";
         return;
     }
 
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 42588fd058..b6c45c40a8 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -137,6 +137,7 @@ Item {
     \li Qt.AltModifier - An Alt key on the keyboard is pressed.
     \li Qt.MetaModifier - A Meta key on the keyboard is pressed.
     \li Qt.KeypadModifier - A keypad button is pressed.
+    \li Qt.GroupSwitchModifier - X11 only. A Mode_switch key on the keyboard is pressed.
     \endlist
 
     For example, to react to a Shift key + Enter key combination:
@@ -552,7 +553,7 @@ void QQuickEventTouchPoint::reset(const QTouchEvent::TouchPoint &tp, ulong times
     QQuickEventPoint::reset(tp.state(), tp.scenePos(), tp.id(), timestamp);
     m_rotation = tp.rotation();
     m_pressure = tp.pressure();
-//    m_uniqueId = tp.uniqueId();
+    m_uniqueId = tp.uniqueId();
 }
 
 /*!
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 6179791413..7b281623fe 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -302,8 +302,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventTouchPoint : public QQuickEventPoint
     Q_OBJECT
     Q_PROPERTY(qreal rotation READ rotation)
     Q_PROPERTY(qreal pressure READ pressure)
-// TODO rename to QPointingDeviceUniqueId
-//    Q_PROPERTY(QPointerUniqueId uniqueId READ uniqueId)
+    Q_PROPERTY(QPointingDeviceUniqueId uniqueId READ uniqueId)
 
 public:
     QQuickEventTouchPoint(QQuickPointerTouchEvent *parent);
@@ -312,12 +311,12 @@ public:
 
     qreal rotation() const { return m_rotation; }
     qreal pressure() const { return m_pressure; }
-//    QPointerUniqueId uniqueId() const { return m_uniqueId; }
+    QPointingDeviceUniqueId uniqueId() const { return m_uniqueId; }
 
 private:
     qreal m_rotation;
     qreal m_pressure;
-//    QPointerUniqueId m_uniqueId;
+    QPointingDeviceUniqueId m_uniqueId;
 
     Q_DISABLE_COPY(QQuickEventTouchPoint)
 };
@@ -451,7 +450,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerDevice : public QObject
     Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints CONSTANT)
     Q_PROPERTY(int buttonCount READ buttonCount CONSTANT)
     Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(qint64 uniqueId READ uniqueId CONSTANT)
+    Q_PROPERTY(QPointingDeviceUniqueId uniqueId READ uniqueId CONSTANT)
 
 public:
     enum DeviceType {
@@ -498,7 +497,8 @@ public:
 
     QQuickPointerDevice(DeviceType devType, PointerType pType, Capabilities caps, int maxPoints, int buttonCount, const QString &name, qint64 uniqueId = 0)
       : m_deviceType(devType), m_pointerType(pType), m_capabilities(caps)
-      , m_maximumTouchPoints(maxPoints), m_buttonCount(buttonCount), m_name(name), m_uniqueId(uniqueId), m_event(nullptr)
+      , m_maximumTouchPoints(maxPoints), m_buttonCount(buttonCount), m_name(name)
+      , m_uniqueId(QPointingDeviceUniqueId::fromNumericId(uniqueId)), m_event(nullptr)
     {
         if (m_deviceType == Mouse) {
             m_event = new QQuickPointerMouseEvent;
@@ -517,7 +517,7 @@ public:
     int maximumTouchPoints() const { return m_maximumTouchPoints; }
     int buttonCount() const { return m_buttonCount; }
     QString name() const { return m_name; }
-    qint64 uniqueId() const { return m_uniqueId; }
+    QPointingDeviceUniqueId uniqueId() const { return m_uniqueId; }
     QQuickPointerEvent *pointerEvent() const { return m_event; }
 
     static QQuickPointerDevice *touchDevice(QTouchDevice *d);
@@ -532,7 +532,7 @@ private:
     int m_maximumTouchPoints;
     int m_buttonCount;
     QString m_name;
-    qint64 m_uniqueId;
+    QPointingDeviceUniqueId m_uniqueId;
     // the device-specific event instance which is reused during event delivery
     QQuickPointerEvent *m_event;
 
@@ -555,7 +555,7 @@ QML_DECLARE_TYPE(QQuickMouseEvent)
 QML_DECLARE_TYPE(QQuickWheelEvent)
 QML_DECLARE_TYPE(QQuickCloseEvent)
 QML_DECLARE_TYPE(QQuickPointerDevice)
-//QML_DECLARE_TYPE(QPointerUniqueId)
+QML_DECLARE_TYPE(QPointingDeviceUniqueId)
 QML_DECLARE_TYPE(QQuickPointerEvent)
 
 #endif // QQUICKEVENTS_P_P_H
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 00a1306627..4ab604b30f 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1570,12 +1570,52 @@ void QQuickFlickablePrivate::replayDelayedPress()
 //XXX pixelAligned ignores the global position of the Flickable, i.e. assumes Flickable itself is pixel aligned.
 void QQuickFlickablePrivate::setViewportX(qreal x)
 {
-    contentItem->setX(pixelAligned ? -Round(-x) : x);
+    Q_Q(QQuickFlickable);
+    if (pixelAligned)
+        x = -Round(-x);
+
+    contentItem->setX(x);
+    if (contentItem->x() != x)
+        return; // reentered
+
+    const qreal maxX = q->maxXExtent();
+    const qreal minX = q->minXExtent();
+
+    qreal overshoot = 0.0;
+    if (x <= maxX)
+        overshoot = maxX - x;
+    else if (x >= minX)
+        overshoot = minX - x;
+
+    if (overshoot != hData.overshoot) {
+        hData.overshoot = overshoot;
+        emit q->horizontalOvershootChanged();
+    }
 }
 
 void QQuickFlickablePrivate::setViewportY(qreal y)
 {
-    contentItem->setY(pixelAligned ? -Round(-y) : y);
+    Q_Q(QQuickFlickable);
+    if (pixelAligned)
+        y = -Round(-y);
+
+    contentItem->setY(y);
+    if (contentItem->y() != y)
+        return; // reentered
+
+    const qreal maxY = q->maxYExtent();
+    const qreal minY = q->minYExtent();
+
+    qreal overshoot = 0.0;
+    if (y <= maxY)
+        overshoot = maxY - y;
+    else if (y >= minY)
+        overshoot = minY - y;
+
+    if (overshoot != vData.overshoot) {
+        vData.overshoot = overshoot;
+        emit q->verticalOvershootChanged();
+    }
 }
 
 void QQuickFlickable::timerEvent(QTimerEvent *event)
@@ -1841,6 +1881,8 @@ QQmlListProperty<QQuickItem> QQuickFlickable::flickableChildren()
     beyond the boundary of the Flickable, and can overshoot the
     boundary when flicked.
     \endlist
+
+    \sa horizontalOvershoot, verticalOvershoot
 */
 QQuickFlickable::BoundsBehavior QQuickFlickable::boundsBehavior() const
 {
@@ -2638,4 +2680,38 @@ void QQuickFlickablePrivate::updateVelocity()
     emit q->verticalVelocityChanged();
 }
 
+/*!
+    \qmlproperty real QtQuick::Flickable::horizontalOvershoot
+    \since 5.9
+
+    This property holds the horizontal overshoot, that is, the horizontal distance by
+    which the contents has been dragged or flicked past the bounds of the flickable.
+    The value is negative when the content is dragged or flicked beyond the beginning,
+    and positive when beyond the end; \c 0.0 otherwise.
+
+    \sa verticalOvershoot, boundsBehavior
+*/
+qreal QQuickFlickable::horizontalOvershoot() const
+{
+    Q_D(const QQuickFlickable);
+    return d->hData.overshoot;
+}
+
+/*!
+    \qmlproperty real QtQuick::Flickable::verticalOvershoot
+    \since 5.9
+
+    This property holds the vertical overshoot, that is, the vertical distance by
+    which the contents has been dragged or flicked past the bounds of the flickable.
+    The value is negative when the content is dragged or flicked beyond the beginning,
+    and positive when beyond the end; \c 0.0 otherwise.
+
+    \sa horizontalOvershoot, boundsBehavior
+*/
+qreal QQuickFlickable::verticalOvershoot() const
+{
+    Q_D(const QQuickFlickable);
+    return d->vData.overshoot;
+}
+
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 7384c7271a..52cade1472 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -106,12 +106,13 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem
 
     Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY pixelAlignedChanged)
 
+    Q_PROPERTY(qreal horizontalOvershoot READ horizontalOvershoot NOTIFY horizontalOvershootChanged REVISION 9)
+    Q_PROPERTY(qreal verticalOvershoot READ verticalOvershoot NOTIFY verticalOvershootChanged REVISION 9)
+
     Q_PROPERTY(QQmlListProperty<QObject> flickableData READ flickableData)
     Q_PROPERTY(QQmlListProperty<QQuickItem> flickableChildren READ flickableChildren)
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
-    Q_FLAGS(BoundsBehavior)
-
 public:
     QQuickFlickable(QQuickItem *parent=0);
     ~QQuickFlickable();
@@ -126,6 +127,7 @@ public:
         DragAndOvershootBounds = DragOverBounds | OvershootBounds
     };
     Q_DECLARE_FLAGS(BoundsBehavior, BoundsBehaviorFlag)
+    Q_FLAG(BoundsBehavior)
 
     BoundsBehavior boundsBehavior() const;
     void setBoundsBehavior(BoundsBehavior);
@@ -201,6 +203,9 @@ public:
     bool pixelAligned() const;
     void setPixelAligned(bool align);
 
+    qreal horizontalOvershoot() const;
+    qreal verticalOvershoot() const;
+
     Q_INVOKABLE void resizeContent(qreal w, qreal h, QPointF center);
     Q_INVOKABLE void returnToBounds();
     Q_INVOKABLE void flick(qreal xVelocity, qreal yVelocity);
@@ -243,6 +248,8 @@ Q_SIGNALS:
     void dragStarted();
     void dragEnded();
     void pixelAlignedChanged();
+    Q_REVISION(9) void horizontalOvershootChanged();
+    Q_REVISION(9) void verticalOvershootChanged();
 
 protected:
     bool childMouseEventFilter(QQuickItem *, QEvent *) Q_DECL_OVERRIDE;
@@ -286,6 +293,7 @@ protected:
 private:
     Q_DISABLE_COPY(QQuickFlickable)
     Q_DECLARE_PRIVATE(QQuickFlickable)
+    friend class QQuickFlickableContentItem;
     friend class QQuickFlickableVisibleArea;
     friend class QQuickFlickableReboundTransition;
 };
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index 0c3bc21071..1ceff22dfc 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -101,7 +101,7 @@ public:
             : move(fp, func)
             , transitionToBounds(0)
             , viewSize(-1), lastPos(0), previousDragDelta(0), velocity(0), startMargin(0), endMargin(0)
-            , origin(0)
+            , origin(0), overshoot(0)
             , transitionTo(0)
             , continuousFlickVelocity(0), velocityTime(), vTime(0)
             , smoothVelocity(fp), atEnd(false), atBeginning(true)
@@ -148,6 +148,7 @@ public:
         qreal startMargin;
         qreal endMargin;
         qreal origin;
+        qreal overshoot;
         qreal transitionTo;
         qreal continuousFlickVelocity;
         QElapsedTimer velocityTime;
diff --git a/src/quick/items/qquickflickablebehavior_p.h b/src/quick/items/qquickflickablebehavior_p.h
index 3377728d3f..ae7fe71359 100644
--- a/src/quick/items/qquickflickablebehavior_p.h
+++ b/src/quick/items/qquickflickablebehavior_p.h
@@ -75,20 +75,12 @@
 
 // The default maximum velocity of a flick.
 #ifndef QML_FLICK_DEFAULTMAXVELOCITY
-#ifdef Q_OS_BLACKBERRY
-#define QML_FLICK_DEFAULTMAXVELOCITY 10000
-#else
-#define QML_FLICK_DEFAULTMAXVELOCITY 2500
-#endif
+# define QML_FLICK_DEFAULTMAXVELOCITY 2500
 #endif
 
 // The default deceleration of a flick.
 #ifndef QML_FLICK_DEFAULTDECELERATION
-#ifdef Q_OS_BLACKBERRY
-#define QML_FLICK_DEFAULTDECELERATION 5000
-#else
-#define QML_FLICK_DEFAULTDECELERATION 1500
-#endif
+# define QML_FLICK_DEFAULTDECELERATION 1500
 #endif
 
 // How much faster to decelerate when overshooting
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 6a6b6c00a9..f452893528 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -153,7 +153,7 @@ void QQuickFlipable::setFront(QQuickItem *front)
 {
     Q_D(QQuickFlipable);
     if (d->front) {
-        qmlInfo(this) << tr("front is a write-once property");
+        qmlWarning(this) << tr("front is a write-once property");
         return;
     }
     d->front = front;
@@ -175,7 +175,7 @@ void QQuickFlipable::setBack(QQuickItem *back)
 {
     Q_D(QQuickFlipable);
     if (d->back) {
-        qmlInfo(this) << tr("back is a write-once property");
+        qmlWarning(this) << tr("back is a write-once property");
         return;
     }
     if (back == 0)
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 14ea43f123..e6a7a0acd0 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -66,19 +66,19 @@ public:
     {
     }
 
-    qreal position() const Q_DECL_OVERRIDE {
+    qreal position() const override {
         return rowPos();
     }
 
-    qreal endPosition() const Q_DECL_OVERRIDE {
+    qreal endPosition() const override {
         return endRowPos();
     }
 
-    qreal size() const Q_DECL_OVERRIDE {
+    qreal size() const override {
         return view->flow() == QQuickGridView::FlowLeftToRight ? view->cellHeight() : view->cellWidth();
     }
 
-    qreal sectionSize() const Q_DECL_OVERRIDE {
+    qreal sectionSize() const override {
         return 0.0;
     }
 
@@ -122,7 +122,7 @@ public:
     void setPosition(qreal col, qreal row, bool immediate = false) {
         moveTo(pointForPosition(col, row), immediate);
     }
-    bool contains(qreal x, qreal y) const Q_DECL_OVERRIDE {
+    bool contains(qreal x, qreal y) const override {
         return (x >= itemX() && x < itemX() + view->cellWidth() &&
                 y >= itemY() && y < itemY() + view->cellHeight());
     }
@@ -159,13 +159,13 @@ class QQuickGridViewPrivate : public QQuickItemViewPrivate
     Q_DECLARE_PUBLIC(QQuickGridView)
 
 public:
-    Qt::Orientation layoutOrientation() const Q_DECL_OVERRIDE;
-    bool isContentFlowReversed() const Q_DECL_OVERRIDE;
+    Qt::Orientation layoutOrientation() const override;
+    bool isContentFlowReversed() const override;
 
-    qreal positionAt(int index) const Q_DECL_OVERRIDE;
-    qreal endPositionAt(int index) const Q_DECL_OVERRIDE;
-    qreal originPosition() const Q_DECL_OVERRIDE;
-    qreal lastPosition() const Q_DECL_OVERRIDE;
+    qreal positionAt(int index) const override;
+    qreal endPositionAt(int index) const override;
+    qreal originPosition() const override;
+    qreal lastPosition() const override;
 
     qreal rowSize() const;
     qreal colSize() const;
@@ -179,43 +179,43 @@ public:
 
     void resetColumns();
 
-    bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer) Q_DECL_OVERRIDE;
-    bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) Q_DECL_OVERRIDE;
+    bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer) override;
+    bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) override;
 
     void removeItem(FxViewItem *item);
 
-    FxViewItem *newViewItem(int index, QQuickItem *item) Q_DECL_OVERRIDE;
-    void initializeViewItem(FxViewItem *item) Q_DECL_OVERRIDE;
-    void repositionItemAt(FxViewItem *item, int index, qreal sizeBuffer) Q_DECL_OVERRIDE;
-    void repositionPackageItemAt(QQuickItem *item, int index) Q_DECL_OVERRIDE;
-    void resetFirstItemPosition(qreal pos = 0.0) Q_DECL_OVERRIDE;
-    void adjustFirstItem(qreal forwards, qreal backwards, int changeBeforeVisible) Q_DECL_OVERRIDE;
-
-    void createHighlight() Q_DECL_OVERRIDE;
-    void updateHighlight() Q_DECL_OVERRIDE;
-    void resetHighlightPosition() Q_DECL_OVERRIDE;
-
-    void setPosition(qreal pos) Q_DECL_OVERRIDE;
-    void layoutVisibleItems(int fromModelIndex = 0) Q_DECL_OVERRIDE;
-    bool applyInsertionChange(const QQmlChangeSet::Change &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) Q_DECL_OVERRIDE;
-    void translateAndTransitionItemsAfter(int afterModelIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult) Q_DECL_OVERRIDE;
-    bool needsRefillForAddedOrRemovedIndex(int index) const Q_DECL_OVERRIDE;
-
-    qreal headerSize() const Q_DECL_OVERRIDE;
-    qreal footerSize() const Q_DECL_OVERRIDE;
-    bool showHeaderForIndex(int index) const Q_DECL_OVERRIDE;
-    bool showFooterForIndex(int index) const Q_DECL_OVERRIDE;
-    void updateHeader() Q_DECL_OVERRIDE;
-    void updateFooter() Q_DECL_OVERRIDE;
-
-    void changedVisibleIndex(int newIndex) Q_DECL_OVERRIDE;
-    void initializeCurrentItem() Q_DECL_OVERRIDE;
-
-    void updateViewport() Q_DECL_OVERRIDE;
-    void fixupPosition() Q_DECL_OVERRIDE;
-    void fixup(AxisData &data, qreal minExtent, qreal maxExtent) Q_DECL_OVERRIDE;
+    FxViewItem *newViewItem(int index, QQuickItem *item) override;
+    void initializeViewItem(FxViewItem *item) override;
+    void repositionItemAt(FxViewItem *item, int index, qreal sizeBuffer) override;
+    void repositionPackageItemAt(QQuickItem *item, int index) override;
+    void resetFirstItemPosition(qreal pos = 0.0) override;
+    void adjustFirstItem(qreal forwards, qreal backwards, int changeBeforeVisible) override;
+
+    void createHighlight() override;
+    void updateHighlight() override;
+    void resetHighlightPosition() override;
+
+    void setPosition(qreal pos) override;
+    void layoutVisibleItems(int fromModelIndex = 0) override;
+    bool applyInsertionChange(const QQmlChangeSet::Change &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) override;
+    void translateAndTransitionItemsAfter(int afterModelIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult) override;
+    bool needsRefillForAddedOrRemovedIndex(int index) const override;
+
+    qreal headerSize() const override;
+    qreal footerSize() const override;
+    bool showHeaderForIndex(int index) const override;
+    bool showFooterForIndex(int index) const override;
+    void updateHeader() override;
+    void updateFooter() override;
+
+    void changedVisibleIndex(int newIndex) override;
+    void initializeCurrentItem() override;
+
+    void updateViewport() override;
+    void fixupPosition() override;
+    void fixup(AxisData &data, qreal minExtent, qreal maxExtent) override;
     bool flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-               QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) Q_DECL_OVERRIDE;
+               QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) override;
 
     QQuickGridView::Flow flow;
     qreal cellWidth;
@@ -383,8 +383,7 @@ qreal QQuickGridViewPrivate::snapPosAt(qreal pos) const
 
 FxViewItem *QQuickGridViewPrivate::snapItemAt(qreal pos) const
 {
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxViewItem *item = visibleItems.at(i);
+    for (FxViewItem *item : visibleItems) {
         if (item->index == -1)
             continue;
         qreal itemTop = item->position();
@@ -397,16 +396,16 @@ FxViewItem *QQuickGridViewPrivate::snapItemAt(qreal pos) const
 int QQuickGridViewPrivate::snapIndex() const
 {
     int index = currentIndex;
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxGridItemSG *item = static_cast<FxGridItemSG*>(visibleItems.at(i));
+    for (FxViewItem *item : visibleItems) {
         if (item->index == -1)
             continue;
         qreal itemTop = item->position();
         FxGridItemSG *hItem = static_cast<FxGridItemSG*>(highlight);
         if (itemTop >= hItem->rowPos()-rowSize()/2 && itemTop < hItem->rowPos()+rowSize()/2) {
-            index = item->index;
-            if (item->colPos() >= hItem->colPos()-colSize()/2 && item->colPos() < hItem->colPos()+colSize()/2)
-                return item->index;
+            FxGridItemSG *gridItem = static_cast<FxGridItemSG*>(item);
+            index = gridItem->index;
+            if (gridItem->colPos() >= hItem->colPos()-colSize()/2 && gridItem->colPos() < hItem->colPos()+colSize()/2)
+                return gridItem->index;
         }
     }
     return index;
@@ -496,8 +495,8 @@ bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal
         // We've jumped more than a page.  Estimate which items are now
         // visible and fill from there.
         int count = (fillFrom - (rowPos + rowSize())) / (rowSize()) * columns;
-        for (int i = 0; i < visibleItems.count(); ++i)
-            releaseItem(visibleItems.at(i));
+        for (FxViewItem *item : qAsConst(visibleItems))
+            releaseItem(item);
         visibleItems.clear();
         modelIndex += count;
         if (modelIndex >= model->count())
@@ -2055,9 +2054,9 @@ void QQuickGridView::viewportMoved(Qt::Orientations orient)
     // Set visibility of items to eliminate cost of items outside the visible area.
     qreal from = d->isContentFlowReversed() ? -d->position()-d->displayMarginBeginning-d->size() : d->position()-d->displayMarginBeginning;
     qreal to = d->isContentFlowReversed() ? -d->position()+d->displayMarginEnd : d->position()+d->size()+d->displayMarginEnd;
-    for (int i = 0; i < d->visibleItems.count(); ++i) {
-        FxGridItemSG *item = static_cast<FxGridItemSG*>(d->visibleItems.at(i));
-        QQuickItemPrivate::get(item->item)->setCulled(item->rowPos() + d->rowSize() < from || item->rowPos() > to);
+    for (FxViewItem *item : qAsConst(d->visibleItems)) {
+        FxGridItemSG *gridItem = static_cast<FxGridItemSG*>(item);
+        QQuickItemPrivate::get(gridItem->item)->setCulled(gridItem->rowPos() + d->rowSize() < from || gridItem->rowPos() > to);
     }
     if (d->currentItem) {
         FxGridItemSG *item = static_cast<FxGridItemSG*>(d->currentItem);
@@ -2357,8 +2356,7 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
             if (modelIndex <= visibleIndex) {
                 // Insert before visible items
                 visibleIndex += count;
-                for (int i = 0; i < visibleItems.count(); ++i) {
-                    FxViewItem *item = visibleItems.at(i);
+                for (FxViewItem *item : qAsConst(visibleItems)) {
                     if (item->index != -1 && item->index >= modelIndex)
                         item->index += count;
                 }
@@ -2391,8 +2389,7 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
     }
 
     // Update the indexes of the following visible items.
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxViewItem *item = visibleItems.at(i);
+    for (FxViewItem *item : qAsConst(visibleItems)) {
         if (item->index != -1 && item->index >= modelIndex) {
             item->index += count;
             if (change.isMove())
@@ -2535,8 +2532,10 @@ void QQuickGridViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex
 
     countItemsRemoved -= removalResult.countChangeAfterVisibleItems;
 
-    for (int i=markerItemIndex+1; i<visibleItems.count() && visibleItems.at(i)->position() < viewEndPos; i++) {
+    for (int i=markerItemIndex+1; i<visibleItems.count(); i++) {
         FxGridItemSG *gridItem = static_cast<FxGridItemSG *>(visibleItems.at(i));
+        if (gridItem->position() >= viewEndPos)
+            break;
         if (!gridItem->transitionScheduledOrRunning()) {
             qreal origRowPos = gridItem->colPos();
             qreal origColPos = gridItem->rowPos();
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index aaf6e4a75b..5c6da2b433 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -84,8 +84,8 @@ public:
     QQuickGridView(QQuickItem *parent=0);
     ~QQuickGridView();
 
-    void setHighlightFollowsCurrentItem(bool) Q_DECL_OVERRIDE;
-    void setHighlightMoveDuration(int) Q_DECL_OVERRIDE;
+    void setHighlightFollowsCurrentItem(bool) override;
+    void setHighlightMoveDuration(int) override;
 
     Flow flow() const;
     void setFlow(Flow);
@@ -117,10 +117,10 @@ Q_SIGNALS:
     void snapModeChanged();
 
 protected:
-    void viewportMoved(Qt::Orientations) Q_DECL_OVERRIDE;
-    void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void initItem(int index, QObject *item) Q_DECL_OVERRIDE;
+    void viewportMoved(Qt::Orientations) override;
+    void keyPressEvent(QKeyEvent *) override;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void initItem(int index, QObject *item) override;
 };
 
 class QQuickGridViewAttached : public QQuickItemViewAttached
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index a6bf6b4e8a..22d631e917 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -281,7 +281,7 @@ void QQuickImageBase::requestFinished()
     Q_D(QQuickImageBase);
 
     if (d->pix.isError()) {
-        qmlInfo(this) << d->pix.error();
+        qmlWarning(this) << d->pix.error();
         d->pix.clear(this);
         d->status = Error;
         if (d->progress != 0.0) {
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 504446a8be..f7b9a58329 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1566,7 +1566,7 @@ QQuickLayoutMirroringAttached::QQuickLayoutMirroringAttached(QObject *parent) :
     if (itemPrivate)
         itemPrivate->extra.value().layoutDirectionAttached = this;
     else
-        qmlInfo(parent) << tr("LayoutDirection attached property only works with Items and Windows");
+        qmlWarning(parent) << tr("LayoutDirection attached property only works with Items and Windows");
 }
 
 QQuickLayoutMirroringAttached * QQuickLayoutMirroringAttached::qmlAttachedProperties(QObject *object)
@@ -1714,7 +1714,7 @@ QQuickEnterKeyAttached::QQuickEnterKeyAttached(QObject *parent)
         itemPrivate = QQuickItemPrivate::get(item);
         itemPrivate->extra.value().enterKeyAttached = this;
     } else
-        qmlInfo(parent) << tr("EnterKey attached property only works with Items");
+        qmlWarning(parent) << tr("EnterKey attached property only works with Items");
 }
 
 QQuickEnterKeyAttached *QQuickEnterKeyAttached::qmlAttachedProperties(QObject *object)
@@ -4374,7 +4374,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const
     }
 
     if (!itemObj && !item->isNull()) {
-        qmlInfo(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow()
+        qmlWarning(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow()
                       << "\" which is neither null nor an Item";
         v4->throwTypeError();
         return;
@@ -4462,7 +4462,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
     }
 
     if (!itemObj && !item->isNull()) {
-        qmlInfo(this) << "mapToItem() given argument \"" << item->toQStringNoThrow()
+        qmlWarning(this) << "mapToItem() given argument \"" << item->toQStringNoThrow()
                       << "\" which is neither null nor an Item";
         v4->throwTypeError();
         return;
@@ -8389,7 +8389,7 @@ void QQuickItemWrapper::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine
 {
     QObjectWrapper::Data *This = static_cast<QObjectWrapper::Data *>(that);
     if (QQuickItem *item = static_cast<QQuickItem*>(This->object())) {
-        foreach (QQuickItem *child, QQuickItemPrivate::get(item)->childItems)
+        for (QQuickItem *child : qAsConst(QQuickItemPrivate::get(item)->childItems))
             QV4::QObjectWrapper::markWrapper(child, e);
     }
     QV4::QObjectWrapper::markObjects(that, e);
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index fd4a7d733f..9873622f41 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -304,7 +304,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
                 bool ok;
                 const QTransform &transform = targetParent->itemTransform(d->via, &ok);
                 if (transform.type() >= QTransform::TxShear || !ok) {
-                    qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under complex transform");
+                    qmlWarning(this) << QQuickParentAnimation::tr("Unable to preserve appearance under complex transform");
                     ok = false;
                 }
 
@@ -315,21 +315,21 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
                     if (transform.m11() == transform.m22())
                         scale = transform.m11();
                     else {
-                        qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
+                        qmlWarning(this) << QQuickParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
                         ok = false;
                     }
                 } else if (ok && isRotate) {
                     if (transform.m11() == transform.m22())
                         scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
                     else {
-                        qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
+                        qmlWarning(this) << QQuickParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
                         ok = false;
                     }
 
                     if (scale != 0)
                         rotation = qAtan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
                     else {
-                        qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under scale of 0");
+                        qmlWarning(this) << QQuickParentAnimation::tr("Unable to preserve appearance under scale of 0");
                         ok = false;
                     }
                 }
@@ -474,7 +474,7 @@ int QQuickAnchorAnimation::duration() const
 void QQuickAnchorAnimation::setDuration(int duration)
 {
     if (duration < 0) {
-        qmlInfo(this) << tr("Cannot set a duration of < 0");
+        qmlWarning(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
@@ -613,7 +613,7 @@ int QQuickPathAnimation::duration() const
 void QQuickPathAnimation::setDuration(int duration)
 {
     if (duration < 0) {
-        qmlInfo(this) << tr("Cannot set a duration of < 0");
+        qmlWarning(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
@@ -869,7 +869,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actio
     data->reverse = direction == Backward ? true : false;
     data->fromSourced = false;
     data->fromDefined = (d->path && d->path->hasStartX() && d->path->hasStartY()) ? true : false;
-    data->toDefined = d->path ? d->path->hasEnd() : false;
+    data->toDefined = d->path ? true : false;
     int origModifiedSize = modified.count();
 
     for (int i = 0; i < actions.count(); ++i) {
diff --git a/src/quick/items/qquickitemgrabresult.cpp b/src/quick/items/qquickitemgrabresult.cpp
index c6355ceed2..07c2cb607c 100644
--- a/src/quick/items/qquickitemgrabresult.cpp
+++ b/src/quick/items/qquickitemgrabresult.cpp
@@ -47,6 +47,7 @@
 #endif
 
 #include <QtQml/QQmlEngine>
+#include <QtQml/QQmlInfo>
 
 #include <private/qquickpixmapcache_p.h>
 #include <private/qquickitem_p.h>
@@ -279,17 +280,17 @@ QQuickItemGrabResult *QQuickItemGrabResultPrivate::create(QQuickItem *item, cons
         size = QSize(item->width(), item->height());
 
     if (size.width() < 1 || size.height() < 1) {
-        qWarning("Item::grabToImage: item has invalid dimensions");
+        qmlWarning(item) << "grabToImage: item has invalid dimensions";
         return 0;
     }
 
     if (!item->window()) {
-        qWarning("Item::grabToImage: item is not attached to a window");
+        qmlWarning(item) << "grabToImage: item is not attached to a window";
         return 0;
     }
 
     if (!item->window()->isVisible()) {
-        qWarning("Item::grabToImage: item's window is not visible");
+        qmlWarning(item) << "grabToImage: item's window is not visible";
         return 0;
     }
 
@@ -377,12 +378,12 @@ bool QQuickItem::grabToImage(const QJSValue &callback, const QSize &targetSize)
 {
     QQmlEngine *engine = qmlEngine(this);
     if (!engine) {
-        qWarning("Item::grabToImage: no QML Engine");
+        qmlWarning(this) << "grabToImage: item has no QML engine";
         return false;
     }
 
     if (!callback.isCallable()) {
-        qWarning("Item::grabToImage: 'callback' is not a function");
+        qmlWarning(this) << "grabToImage: 'callback' is not a function";
         return false;
     }
 
@@ -391,12 +392,12 @@ bool QQuickItem::grabToImage(const QJSValue &callback, const QSize &targetSize)
         size = QSize(width(), height());
 
     if (size.width() < 1 || size.height() < 1) {
-        qWarning("Item::grabToImage: item has invalid dimensions");
+        qmlWarning(this) << "grabToImage: item has invalid dimensions";
         return false;
     }
 
     if (!window()) {
-        qWarning("Item::grabToImage: item is not attached to a window");
+        qmlWarning(this) << "grabToImage: item is not attached to a window";
         return false;
     }
 
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index e9439275ac..65143f3e9b 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -299,8 +299,10 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickGrid, 1>(uri, 2, 1, "Grid");
 #endif
 #if QT_CONFIG(quick_itemview)
-    qmlRegisterUncreatableType<QQuickItemView, 1>(uri, 2, 1, "ItemView", QQuickItemView::tr("ItemView is an abstract base class"));
-    qmlRegisterUncreatableType<QQuickItemView, 2>(uri, 2, 3, "ItemView", QQuickItemView::tr("ItemView is an abstract base class"));
+    const char *itemViewName = "ItemView";
+    const QString itemViewMessage = QQuickItemView::tr("ItemView is an abstract base class");
+    qmlRegisterUncreatableType<QQuickItemView, 1>(uri, 2, 1, itemViewName, itemViewMessage);
+    qmlRegisterUncreatableType<QQuickItemView, 2>(uri, 2, 3, itemViewName, itemViewMessage);
 #endif
 #if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 1>(uri, 2, 1, "ListView");
@@ -362,6 +364,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
 #if QT_CONFIG(quick_pathview)
     qmlRegisterType<QQuickPathView, 7>(uri, 2, 7, "PathView");
 #endif
+#if QT_CONFIG(quick_itemview)
+    qmlRegisterUncreatableType<QQuickItemView, 7>(uri, 2, 7, itemViewName, itemViewMessage);
+#endif
 
     qmlRegisterUncreatableType<QQuickMouseEvent, 7>(uri, 2, 7, nullptr, QQuickMouseEvent::tr("MouseEvent is only available within handlers in MouseArea"));
 
@@ -370,6 +375,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickBorderImageMesh>("QtQuick", 2, 8, "BorderImageMesh");
 #endif
 
+    qmlRegisterType<QQuickFlickable, 9>(uri, 2, 9, "Flickable");
     qmlRegisterType<QQuickMouseArea, 9>(uri, 2, 9, "MouseArea");
 
 #if QT_CONFIG(quick_path)
@@ -381,6 +387,16 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterUncreatableType<QQuickPathGradient>(uri, 2, 9, "PathGradient", QQuickPathGradient::tr("PathGradient is an abstract base class"));
     qmlRegisterType<QQuickPathLinearGradient>(uri, 2, 9, "PathLinearGradient");
 #endif
+
+    qmlRegisterType<QQuickText, 9>(uri, 2, 9, "Text");
+    qmlRegisterType<QQuickTextInput, 9>(uri, 2, 9, "TextInput");
+    qmlRegisterType<QQuickTouchPoint>(uri, 2, 9, "TouchPoint");
+    qRegisterMetaType<QPointingDeviceUniqueId>("QPointingDeviceUniqueId");
+    qmlRegisterUncreatableType<QPointingDeviceUniqueId>(uri, 2, 9, "PointingDeviceUniqueId", QQuickTouchPoint::tr("PointingDeviceUniqueId is only available via read-only properties"));
+#if QT_CONFIG(quick_positioners)
+    qmlRegisterUncreatableType<QQuickBasePositioner, 9>(uri, 2, 9, "Positioner",
+                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
+#endif
 }
 
 static void initResources()
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 7d98cc2693..a8bac633cc 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -380,8 +380,8 @@ void QQuickItemView::setDelegate(QQmlComponent *delegate)
         int oldCount = dataModel->count();
         dataModel->setDelegate(delegate);
         if (isComponentComplete()) {
-            for (int i = 0; i < d->visibleItems.count(); ++i)
-                d->releaseItem(d->visibleItems.at(i));
+            for (FxViewItem *item : qAsConst(d->visibleItems))
+                d->releaseItem(item);
             d->visibleItems.clear();
             d->releaseItem(d->currentItem);
             d->currentItem = 0;
@@ -487,7 +487,7 @@ void QQuickItemView::setCacheBuffer(int b)
 {
     Q_D(QQuickItemView);
     if (b < 0) {
-        qmlInfo(this) << "Cannot set a negative cache buffer";
+        qmlWarning(this) << "Cannot set a negative cache buffer";
         return;
     }
 
@@ -946,12 +946,12 @@ void QQuickItemViewPrivate::positionViewAtIndex(int index, int mode)
         qreal itemPos = positionAt(idx);
         changedVisibleIndex(idx);
         // save the currently visible items in case any of them end up visible again
-        QList<FxViewItem *> oldVisible = visibleItems;
+        const QList<FxViewItem *> oldVisible = visibleItems;
         visibleItems.clear();
         setPosition(qMin(itemPos, maxExtent));
         // now release the reference to all the old visible items.
-        for (int i = 0; i < oldVisible.count(); ++i)
-            releaseItem(oldVisible.at(i));
+        for (FxViewItem *item : oldVisible)
+            releaseItem(item);
         item = visibleItem(idx);
     }
     if (item) {
@@ -1199,10 +1199,10 @@ void QQuickItemViewPrivate::checkVisible() const
 void QQuickItemViewPrivate::showVisibleItems() const
 {
     qDebug() << "Visible items:";
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        qDebug() << "\t" << visibleItems.at(i)->index
-                 << visibleItems.at(i)->item->objectName()
-                 << visibleItems.at(i)->position();
+    for (FxViewItem *item : visibleItems) {
+        qDebug() << "\t" << item->index
+                 << item->item->objectName()
+                 << item->position();
     }
 }
 
@@ -1646,8 +1646,7 @@ FxViewItem *QQuickItemViewPrivate::visibleItem(int modelIndex) const {
 // that don't look at the view position and size
 FxViewItem *QQuickItemViewPrivate::firstVisibleItem() const {
     const qreal pos = isContentFlowReversed() ? -position()-size() : position();
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxViewItem *item = visibleItems.at(i);
+    for (FxViewItem *item : visibleItems) {
         if (item->index != -1 && item->endPosition() > pos)
             return item;
     }
@@ -1744,14 +1743,14 @@ void QQuickItemViewPrivate::clear()
     currentChanges.reset();
     timeline.clear();
 
-    for (int i = 0; i < visibleItems.count(); ++i)
-        releaseItem(visibleItems.at(i));
+    for (FxViewItem *item : qAsConst(visibleItems))
+        releaseItem(item);
     visibleItems.clear();
     visibleIndex = 0;
 
-    for (int i = 0; i < releasePendingTransition.count(); ++i) {
-        releasePendingTransition.at(i)->releaseAfterTransition = false;
-        releaseItem(releasePendingTransition.at(i));
+    for (FxViewItem *item : qAsConst(releasePendingTransition)) {
+        item->releaseAfterTransition = false;
+        releaseItem(item);
     }
     releasePendingTransition.clear();
 
@@ -1912,9 +1911,9 @@ void QQuickItemViewPrivate::layout()
     forceLayout = false;
 
     if (transitioner && transitioner->canTransition(QQuickItemViewTransitioner::PopulateTransition, true)) {
-        for (int i=0; i<visibleItems.count(); i++) {
-            if (!visibleItems.at(i)->transitionScheduledOrRunning())
-                visibleItems.at(i)->transitionNextReposition(transitioner, QQuickItemViewTransitioner::PopulateTransition, true);
+        for (FxViewItem *item : qAsConst(visibleItems)) {
+            if (!item->transitionScheduledOrRunning())
+                item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::PopulateTransition, true);
         }
     }
 
@@ -2010,18 +2009,18 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
     ChangeResult removalResult(prevViewPos);
 
     int removedCount = 0;
-    for (int i=0; i<removals.count(); i++) {
-        itemCount -= removals[i].count;
-        if (applyRemovalChange(removals[i], &removalResult, &removedCount))
+    for (const QQmlChangeSet::Change &r : removals) {
+        itemCount -= r.count;
+        if (applyRemovalChange(r, &removalResult, &removedCount))
             visibleAffected = true;
-        if (!visibleAffected && needsRefillForAddedOrRemovedIndex(removals[i].index))
+        if (!visibleAffected && needsRefillForAddedOrRemovedIndex(r.index))
             visibleAffected = true;
         const int correctedFirstVisibleIndex = prevFirstVisibleIndex - removalResult.countChangeBeforeVisible;
-        if (correctedFirstVisibleIndex >= 0 && removals[i].index < correctedFirstVisibleIndex) {
-            if (removals[i].index + removals[i].count < correctedFirstVisibleIndex)
-                removalResult.countChangeBeforeVisible += removals[i].count;
+        if (correctedFirstVisibleIndex >= 0 && r.index < correctedFirstVisibleIndex) {
+            if (r.index + r.count < correctedFirstVisibleIndex)
+                removalResult.countChangeBeforeVisible += r.count;
             else
-                removalResult.countChangeBeforeVisible += (correctedFirstVisibleIndex  - removals[i].index);
+                removalResult.countChangeBeforeVisible += (correctedFirstVisibleIndex  - r.index);
         }
     }
     if (runDelayedRemoveTransition) {
@@ -2068,23 +2067,23 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
         }
         itemCount += insertions[i].count;
     }
-    for (int i=0; i<newItems.count(); i++) {
-        if (newItems.at(i)->attached)
-            newItems.at(i)->attached->emitAdd();
+    for (FxViewItem *item : qAsConst(newItems)) {
+        if (item->attached)
+            item->attached->emitAdd();
     }
 
     // for each item that was moved directly into the view as a result of a move(),
     // find the index it was moved from in order to set its initial position, so that we
     // can transition it from this "original" position to its new position in the view
     if (transitioner && transitioner->canTransition(QQuickItemViewTransitioner::MoveTransition, true)) {
-        for (int i=0; i<movingIntoView.count(); i++) {
-            int fromIndex = findMoveKeyIndex(movingIntoView.at(i).moveKey, removals);
+        for (const MovedItem &m : qAsConst(movingIntoView)) {
+            int fromIndex = findMoveKeyIndex(m.moveKey, removals);
             if (fromIndex >= 0) {
                 if (prevFirstVisibleIndex >= 0 && fromIndex < prevFirstVisibleIndex)
-                    repositionItemAt(movingIntoView.at(i).item, fromIndex, -totalInsertionResult->sizeChangesAfterVisiblePos);
+                    repositionItemAt(m.item, fromIndex, -totalInsertionResult->sizeChangesAfterVisiblePos);
                 else
-                    repositionItemAt(movingIntoView.at(i).item, fromIndex, totalInsertionResult->sizeChangesAfterVisiblePos);
-                movingIntoView.at(i).item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::MoveTransition, true);
+                    repositionItemAt(m.item, fromIndex, totalInsertionResult->sizeChangesAfterVisiblePos);
+                m.item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::MoveTransition, true);
             }
         }
     }
@@ -2345,7 +2344,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, bool asynchronous)
             if (!delegateValidated) {
                 delegateValidated = true;
                 QObject* delegate = q->delegate();
-                qmlInfo(delegate ? delegate : q) << QQuickItemView::tr("Delegate must be of Item type");
+                qmlWarning(delegate ? delegate : q) << QQuickItemView::tr("Delegate must be of Item type");
             }
         }
         inRequest = false;
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 3ac54ea3dc..b38bc6174f 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -232,10 +232,10 @@ public:
     Q_INVOKABLE void positionViewAtEnd();
     Q_REVISION(1) Q_INVOKABLE void forceLayout();
 
-    void setContentX(qreal pos) Q_DECL_OVERRIDE;
-    void setContentY(qreal pos) Q_DECL_OVERRIDE;
-    qreal originX() const Q_DECL_OVERRIDE;
-    qreal originY() const Q_DECL_OVERRIDE;
+    void setContentX(qreal pos) override;
+    void setContentY(qreal pos) override;
+    qreal originX() const override;
+    qreal originY() const override;
 
 Q_SIGNALS:
     void modelChanged();
@@ -277,13 +277,13 @@ Q_SIGNALS:
     void highlightMoveDurationChanged();
 
 protected:
-    void updatePolish() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    qreal minYExtent() const Q_DECL_OVERRIDE;
-    qreal maxYExtent() const Q_DECL_OVERRIDE;
-    qreal minXExtent() const Q_DECL_OVERRIDE;
-    qreal maxXExtent() const Q_DECL_OVERRIDE;
+    void updatePolish() override;
+    void componentComplete() override;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    qreal minYExtent() const override;
+    qreal maxYExtent() const override;
+    qreal minXExtent() const override;
+    qreal maxXExtent() const override;
 
 protected Q_SLOTS:
     void destroyRemoved();
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index a8e66301c1..3087682ac7 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -201,10 +201,10 @@ public:
 
     void regenerate(bool orientationChanged=false);
     void layout();
-    virtual void animationFinished(QAbstractAnimationJob *) Q_DECL_OVERRIDE;
+    virtual void animationFinished(QAbstractAnimationJob *) override;
     void refill();
     void refill(qreal from, qreal to);
-    void mirrorChange() Q_DECL_OVERRIDE;
+    void mirrorChange() override;
 
     FxViewItem *createItem(int modelIndex, bool asynchronous = false);
     virtual bool releaseItem(FxViewItem *item);
@@ -236,7 +236,7 @@ public:
     void prepareVisibleItemTransitions();
     void prepareRemoveTransitions(QHash<QQmlChangeSet::MoveKey, FxViewItem *> *removedItems);
     bool prepareNonVisibleItemTransition(FxViewItem *item, const QRectF &viewBounds);
-    void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) Q_DECL_OVERRIDE;
+    void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) override;
 
     int findMoveKeyIndex(QQmlChangeSet::MoveKey key, const QVector<QQmlChangeSet::Change> &changes) const;
 
@@ -348,8 +348,8 @@ protected:
     virtual bool showFooterForIndex(int index) const = 0;
     virtual void updateHeader() = 0;
     virtual void updateFooter() = 0;
-    virtual bool hasStickyHeader() const { return false; };
-    virtual bool hasStickyFooter() const { return false; };
+    virtual bool hasStickyHeader() const { return false; }
+    virtual bool hasStickyFooter() const { return false; }
 
     virtual void createHighlight() = 0;
     virtual void updateHighlight() = 0;
@@ -382,7 +382,7 @@ protected:
     virtual void updateSectionCriteria() {}
     virtual void updateSections() {}
 
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) Q_DECL_OVERRIDE;
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) override;
 };
 
 
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 83c451613e..700c4cc620 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -64,7 +64,7 @@ public:
     bool *m_wasDeleted;
 
 protected:
-    void finished() Q_DECL_OVERRIDE;
+    void finished() override;
 };
 
 
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index f89a995e76..0351077f20 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -65,51 +65,51 @@ class QQuickListViewPrivate : public QQuickItemViewPrivate
 public:
     static QQuickListViewPrivate* get(QQuickListView *item) { return item->d_func(); }
 
-    Qt::Orientation layoutOrientation() const Q_DECL_OVERRIDE;
-    bool isContentFlowReversed() const Q_DECL_OVERRIDE;
+    Qt::Orientation layoutOrientation() const override;
+    bool isContentFlowReversed() const override;
     bool isRightToLeft() const;
     bool isBottomToTop() const;
 
-    qreal positionAt(int index) const Q_DECL_OVERRIDE;
-    qreal endPositionAt(int index) const Q_DECL_OVERRIDE;
-    qreal originPosition() const Q_DECL_OVERRIDE;
-    qreal lastPosition() const Q_DECL_OVERRIDE;
+    qreal positionAt(int index) const override;
+    qreal endPositionAt(int index) const override;
+    qreal originPosition() const override;
+    qreal lastPosition() const override;
 
     FxViewItem *itemBefore(int modelIndex) const;
     QString sectionAt(int modelIndex);
     qreal snapPosAt(qreal pos);
     FxViewItem *snapItemAt(qreal pos);
 
-    void init() Q_DECL_OVERRIDE;
-    void clear() Q_DECL_OVERRIDE;
+    void init() override;
+    void clear() override;
 
-    bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer) Q_DECL_OVERRIDE;
-    bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) Q_DECL_OVERRIDE;
-    void visibleItemsChanged() Q_DECL_OVERRIDE;
+    bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer) override;
+    bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) override;
+    void visibleItemsChanged() override;
 
     void removeItem(FxViewItem *item);
 
-    FxViewItem *newViewItem(int index, QQuickItem *item) Q_DECL_OVERRIDE;
-    void initializeViewItem(FxViewItem *item) Q_DECL_OVERRIDE;
-    bool releaseItem(FxViewItem *item) Q_DECL_OVERRIDE;
-    void repositionItemAt(FxViewItem *item, int index, qreal sizeBuffer) Q_DECL_OVERRIDE;
-    void repositionPackageItemAt(QQuickItem *item, int index) Q_DECL_OVERRIDE;
-    void resetFirstItemPosition(qreal pos = 0.0) Q_DECL_OVERRIDE;
-    void adjustFirstItem(qreal forwards, qreal backwards, int) Q_DECL_OVERRIDE;
-    void updateSizeChangesBeforeVisiblePos(FxViewItem *item, ChangeResult *removeResult) Q_DECL_OVERRIDE;
+    FxViewItem *newViewItem(int index, QQuickItem *item) override;
+    void initializeViewItem(FxViewItem *item) override;
+    bool releaseItem(FxViewItem *item) override;
+    void repositionItemAt(FxViewItem *item, int index, qreal sizeBuffer) override;
+    void repositionPackageItemAt(QQuickItem *item, int index) override;
+    void resetFirstItemPosition(qreal pos = 0.0) override;
+    void adjustFirstItem(qreal forwards, qreal backwards, int) override;
+    void updateSizeChangesBeforeVisiblePos(FxViewItem *item, ChangeResult *removeResult) override;
 
-    void createHighlight() Q_DECL_OVERRIDE;
-    void updateHighlight() Q_DECL_OVERRIDE;
-    void resetHighlightPosition() Q_DECL_OVERRIDE;
+    void createHighlight() override;
+    void updateHighlight() override;
+    void resetHighlightPosition() override;
 
-    void setPosition(qreal pos) Q_DECL_OVERRIDE;
-    void layoutVisibleItems(int fromModelIndex = 0) Q_DECL_OVERRIDE;
+    void setPosition(qreal pos) override;
+    void layoutVisibleItems(int fromModelIndex = 0) override;
 
-    bool applyInsertionChange(const QQmlChangeSet::Change &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) Q_DECL_OVERRIDE;
-    void translateAndTransitionItemsAfter(int afterIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult) Q_DECL_OVERRIDE;
+    bool applyInsertionChange(const QQmlChangeSet::Change &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) override;
+    void translateAndTransitionItemsAfter(int afterIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult) override;
 
-    void updateSectionCriteria() Q_DECL_OVERRIDE;
-    void updateSections() Q_DECL_OVERRIDE;
+    void updateSectionCriteria() override;
+    void updateSections() override;
     QQuickItem *getSectionItem(const QString &section);
     void releaseSectionItem(QQuickItem *item);
     void releaseSectionItems();
@@ -117,25 +117,25 @@ public:
     void updateCurrentSection();
     void updateStickySections();
 
-    qreal headerSize() const Q_DECL_OVERRIDE;
-    qreal footerSize() const Q_DECL_OVERRIDE;
-    bool showHeaderForIndex(int index) const Q_DECL_OVERRIDE;
-    bool showFooterForIndex(int index) const Q_DECL_OVERRIDE;
-    void updateHeader() Q_DECL_OVERRIDE;
-    void updateFooter() Q_DECL_OVERRIDE;
-    bool hasStickyHeader() const Q_DECL_OVERRIDE;
-    bool hasStickyFooter() const Q_DECL_OVERRIDE;
+    qreal headerSize() const override;
+    qreal footerSize() const override;
+    bool showHeaderForIndex(int index) const override;
+    bool showFooterForIndex(int index) const override;
+    void updateHeader() override;
+    void updateFooter() override;
+    bool hasStickyHeader() const override;
+    bool hasStickyFooter() const override;
 
-    void changedVisibleIndex(int newIndex) Q_DECL_OVERRIDE;
-    void initializeCurrentItem() Q_DECL_OVERRIDE;
+    void changedVisibleIndex(int newIndex) override;
+    void initializeCurrentItem() override;
 
     void updateAverage();
 
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void fixupPosition() Q_DECL_OVERRIDE;
-    void fixup(AxisData &data, qreal minExtent, qreal maxExtent) Q_DECL_OVERRIDE;
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry) override;
+    void fixupPosition() override;
+    void fixup(AxisData &data, qreal minExtent, qreal maxExtent) override;
     bool flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-               QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) Q_DECL_OVERRIDE;
+               QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) override;
 
     QQuickListView::Orientation orient;
     qreal visiblePos;
@@ -263,7 +263,7 @@ public:
         static_cast<QQuickListViewAttached*>(attached)->m_sectionItem = s;
     }
 
-    qreal position() const Q_DECL_OVERRIDE {
+    qreal position() const override {
         if (section()) {
             if (view->orientation() == QQuickListView::Vertical)
                 return (view->verticalLayoutDirection() == QQuickItemView::BottomToTop ? -section()->height()-section()->y() : section()->y());
@@ -279,7 +279,7 @@ public:
         else
             return (view->effectiveLayoutDirection() == Qt::RightToLeft ? -itemWidth()-itemX() : itemX());
     }
-    qreal size() const Q_DECL_OVERRIDE {
+    qreal size() const override {
         if (section())
             return (view->orientation() == QQuickListView::Vertical ? itemHeight()+section()->height() : itemWidth()+section()->width());
         else
@@ -288,12 +288,12 @@ public:
     qreal itemSize() const {
         return (view->orientation() == QQuickListView::Vertical ? itemHeight() : itemWidth());
     }
-    qreal sectionSize() const Q_DECL_OVERRIDE {
+    qreal sectionSize() const override {
         if (section())
             return (view->orientation() == QQuickListView::Vertical ? section()->height() : section()->width());
         return 0.0;
     }
-    qreal endPosition() const Q_DECL_OVERRIDE {
+    qreal endPosition() const override {
         if (view->orientation() == QQuickListView::Vertical) {
             return (view->verticalLayoutDirection() == QQuickItemView::BottomToTop
                     ? -itemY()
@@ -327,7 +327,7 @@ public:
         else
             item->setWidth(size);
     }
-    bool contains(qreal x, qreal y) const Q_DECL_OVERRIDE {
+    bool contains(qreal x, qreal y) const override {
         return (x >= itemX() && x < itemX() + itemWidth() &&
                 y >= itemY() && y < itemY() + itemHeight());
     }
@@ -438,11 +438,12 @@ qreal QQuickListViewPrivate::lastPosition() const
         int invisibleCount = INT_MIN;
         int delayRemovedCount = 0;
         for (int i = visibleItems.count()-1; i >= 0; --i) {
-            if (visibleItems.at(i)->index != -1) {
+            FxViewItem *item = visibleItems.at(i);
+            if (item->index != -1) {
                 // Find the invisible count after the last visible item with known index
-                invisibleCount = model->count() - (visibleItems.at(i)->index + 1 + delayRemovedCount);
+                invisibleCount = model->count() - (item->index + 1 + delayRemovedCount);
                 break;
-            } else if (visibleItems.at(i)->attached->delayRemove()) {
+            } else if (item->attached->delayRemove()) {
                 ++delayRemovedCount;
             }
         }
@@ -530,8 +531,7 @@ FxViewItem *QQuickListViewPrivate::snapItemAt(qreal pos)
 {
     FxViewItem *snapItem = 0;
     qreal prevItemSize = 0;
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxViewItem *item = visibleItems.at(i);
+    for (FxViewItem *item : qAsConst(visibleItems)) {
         if (item->index == -1)
             continue;
         qreal itemTop = item->position();
@@ -660,8 +660,8 @@ bool QQuickListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal
         int newModelIdx = qBound(0, modelIndex + count, model->count());
         count = newModelIdx - modelIndex;
         if (count) {
-            for (int i = 0; i < visibleItems.count(); ++i)
-                releaseItem(visibleItems.at(i));
+            for (FxViewItem *item : qAsConst(visibleItems))
+                releaseItem(item);
             visibleItems.clear();
             modelIndex = newModelIdx;
             visibleIndex = modelIndex;
@@ -1008,8 +1008,8 @@ void QQuickListViewPrivate::releaseSectionItem(QQuickItem *item)
 
 void QQuickListViewPrivate::releaseSectionItems()
 {
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxListItemSG *listItem = static_cast<FxListItemSG *>(visibleItems.at(i));
+    for (FxViewItem *item : qAsConst(visibleItems)) {
+        FxListItemSG *listItem = static_cast<FxListItemSG *>(item);
         if (listItem->section()) {
             qreal pos = listItem->position();
             releaseSectionItem(listItem->section());
@@ -1168,16 +1168,15 @@ void QQuickListViewPrivate::updateSections()
         QQuickListViewAttached *prevAtt = 0;
         int prevIdx = -1;
         int idx = -1;
-        for (int i = 0; i < visibleItems.count(); ++i) {
-            FxViewItem *item = visibleItems.at(i);
+        for (FxViewItem *item : qAsConst(visibleItems)) {
             QQuickListViewAttached *attached = static_cast<QQuickListViewAttached*>(item->attached);
             attached->setPrevSection(prevSection);
-            if (visibleItems.at(i)->index != -1) {
-                QString propValue = model->stringValue(visibleItems.at(i)->index, sectionCriteria->property());
+            if (item->index != -1) {
+                QString propValue = model->stringValue(item->index, sectionCriteria->property());
                 attached->setSection(sectionCriteria->sectionString(propValue));
-                idx = visibleItems.at(i)->index;
+                idx = item->index;
             }
-            updateInlineSection(static_cast<FxListItemSG*>(visibleItems.at(i)));
+            updateInlineSection(static_cast<FxListItemSG*>(item));
             if (prevAtt)
                 prevAtt->setNextSection(sectionAt(prevIdx+1));
             prevSection = attached->section();
@@ -1210,9 +1209,12 @@ void QQuickListViewPrivate::updateCurrentSection()
     qreal startPos = hasStickyHeader() ? header->endPosition() : viewPos;
     int index = 0;
     int modelIndex = visibleIndex;
-    while (index < visibleItems.count() && visibleItems.at(index)->endPosition() <= startPos) {
-        if (visibleItems.at(index)->index != -1)
-            modelIndex = visibleItems.at(index)->index;
+    while (index < visibleItems.count()) {
+        FxViewItem *item = visibleItems.at(index);
+        if (item->endPosition() > startPos)
+            break;
+        if (item->index != -1)
+            modelIndex = item->index;
         ++index;
     }
 
@@ -1236,10 +1238,13 @@ void QQuickListViewPrivate::updateCurrentSection()
         qreal endPos = hasStickyFooter() ? footer->position() : viewPos + size();
         if (nextSectionItem && !inlineSections)
             endPos -= orient == QQuickListView::Vertical ? nextSectionItem->height() : nextSectionItem->width();
-        while (index < visibleItems.count() && static_cast<FxListItemSG*>(visibleItems.at(index))->itemPosition() < endPos) {
-            if (visibleItems.at(index)->index != -1)
-                modelIndex = visibleItems.at(index)->index;
-            lastSection = visibleItems.at(index)->attached->section();
+        while (index < visibleItems.count()) {
+            FxListItemSG *listItem = static_cast<FxListItemSG *>(visibleItems.at(index));
+            if (listItem->itemPosition() >= endPos)
+                break;
+            if (listItem->index != -1)
+                modelIndex = listItem->index;
+            lastSection = listItem->attached->section();
             ++index;
         }
 
@@ -1288,8 +1293,8 @@ void QQuickListViewPrivate::updateAverage()
     if (!visibleItems.count())
         return;
     qreal sum = 0.0;
-    for (int i = 0; i < visibleItems.count(); ++i)
-        sum += visibleItems.at(i)->size();
+    for (FxViewItem *item : qAsConst(visibleItems))
+        sum += item->size();
     averageSize = qRound(sum / visibleItems.count());
 }
 
@@ -1462,9 +1467,15 @@ void QQuickListViewPrivate::fixupPosition()
 
 void QQuickListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
 {
-    if ((orient == QQuickListView::Horizontal && &data == &vData)
-        || (orient == QQuickListView::Vertical && &data == &hData))
+    if (orient == QQuickListView::Horizontal && &data == &vData) {
+        if (flickableDirection != QQuickFlickable::HorizontalFlick)
+            QQuickItemViewPrivate::fixup(data, minExtent, maxExtent);
+        return;
+    } else if (orient == QQuickListView::Vertical && &data == &hData) {
+        if (flickableDirection != QQuickFlickable::VerticalFlick)
+            QQuickItemViewPrivate::fixup(data, minExtent, maxExtent);
         return;
+    }
 
     correctFlick = false;
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
@@ -1813,6 +1824,19 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             \image listview-layout-righttoleft.png
     \endtable
 
+    \section1 Flickable Direction
+
+    By default, a vertical ListView sets \l {Flickable::}{flickableDirection} to \e Flickable.Vertical,
+    and a horizontal ListView sets it to \e Flickable.Horizontal. Furthermore, a vertical ListView only
+    calculates (estimates) the \l {Flickable::}{contentHeight}, and a horizontal ListView only calculates
+    the \l {Flickable::}{contentWidth}. The other dimension is set to \e -1.
+
+    Since Qt 5.9 (Qt Quick 2.9), it is possible to make a ListView that can be flicked to both directions.
+    In order to do this, the \l {Flickable::}{flickableDirection} can be set to \e Flickable.AutoFlickDirection
+    or \e Flickable.AutoFlickIfNeeded, and the desired \e contentWidth or \e contentHeight must be provided.
+
+    \snippet qml/listview/listview.qml flickBothDirections
+
     \sa {QML Data Models}, GridView, PathView, {Qt Quick Examples - Views}
 */
 QQuickListView::QQuickListView(QQuickItem *parent)
@@ -2099,6 +2123,8 @@ void QQuickListView::setSpacing(qreal spacing)
     \li Vertical orientation:
     \image listview-highlight.png
     \endtable
+
+    \sa {Flickable Direction}
 */
 QQuickListView::Orientation QQuickListView::orientation() const
 {
@@ -2112,12 +2138,18 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation)
     if (d->orient != orientation) {
         d->orient = orientation;
         if (d->orient == Vertical) {
-            setContentWidth(-1);
-            setFlickableDirection(VerticalFlick);
+            if (d->flickableDirection == HorizontalFlick) {
+                setFlickableDirection(VerticalFlick);
+                if (isComponentComplete())
+                    setContentWidth(-1);
+            }
             setContentX(0);
         } else {
-            setContentHeight(-1);
-            setFlickableDirection(HorizontalFlick);
+            if (d->flickableDirection == VerticalFlick) {
+                setFlickableDirection(HorizontalFlick);
+                if (isComponentComplete())
+                    setContentHeight(-1);
+            }
             setContentY(0);
         }
         d->regenerate(true);
@@ -2899,8 +2931,7 @@ void QQuickListView::viewportMoved(Qt::Orientations orient)
     // Set visibility of items to eliminate cost of items outside the visible area.
     qreal from = d->isContentFlowReversed() ? -d->position()-d->displayMarginBeginning-d->size() : d->position()-d->displayMarginBeginning;
     qreal to = d->isContentFlowReversed() ? -d->position()+d->displayMarginEnd : d->position()+d->size()+d->displayMarginEnd;
-    for (int i = 0; i < d->visibleItems.count(); ++i) {
-        FxViewItem *item = static_cast<FxListItemSG*>(d->visibleItems.at(i));
+    for (FxViewItem *item : qAsConst(d->visibleItems)) {
         if (item->item)
             QQuickItemPrivate::get(item->item)->setCulled(item->endPosition() < from || item->position() > to);
     }
@@ -3042,6 +3073,21 @@ void QQuickListView::initItem(int index, QObject *object)
     }
 }
 
+qreal QQuickListView::maxYExtent() const
+{
+    Q_D(const QQuickListView);
+    if (d->layoutOrientation() == Qt::Horizontal && d->flickableDirection != HorizontalFlick)
+        return QQuickFlickable::maxYExtent();
+    return QQuickItemView::maxYExtent();
+}
+
+qreal QQuickListView::maxXExtent() const
+{
+    Q_D(const QQuickListView);
+    if (d->layoutOrientation() == Qt::Vertical && d->flickableDirection != VerticalFlick)
+        return QQuickFlickable::maxXExtent();
+    return QQuickItemView::maxXExtent();
+}
 
 /*!
     \qmlmethod QtQuick::ListView::incrementCurrentIndex()
@@ -3120,8 +3166,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
             if (modelIndex < visibleIndex) {
                 // Insert before visible items
                 visibleIndex += count;
-                for (int i = 0; i < visibleItems.count(); ++i) {
-                    FxViewItem *item = visibleItems.at(i);
+                for (FxViewItem *item : qAsConst(visibleItems)) {
                     if (item->index != -1 && item->index >= modelIndex)
                         item->index += count;
                 }
@@ -3138,8 +3183,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
     }
 
     // Update the indexes of the following visible items.
-    for (int i = 0; i < visibleItems.count(); ++i) {
-        FxViewItem *item = visibleItems.at(i);
+    for (FxViewItem *item : qAsConst(visibleItems)) {
         if (item->index != -1 && item->index >= modelIndex) {
             item->index += count;
             if (change.isMove())
@@ -3281,8 +3325,10 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex
     qreal sizeRemoved = -removalResult.sizeChangesAfterVisiblePos
             - (removalResult.countChangeAfterVisibleItems * (averageSize + spacing));
 
-    for (int i=markerItemIndex+1; i<visibleItems.count() && visibleItems.at(i)->position() < viewEndPos; i++) {
+    for (int i=markerItemIndex+1; i<visibleItems.count(); i++) {
         FxListItemSG *listItem = static_cast<FxListItemSG *>(visibleItems.at(i));
+        if (listItem->position() >= viewEndPos)
+            break;
         if (!listItem->transitionScheduledOrRunning()) {
             qreal pos = listItem->position();
             listItem->setPosition(pos - sizeRemoved);
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index 3a871e88e9..f8db0f0f8f 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -146,7 +146,7 @@ public:
     QQuickViewSection *sectionCriteria();
     QString currentSection() const;
 
-    void setHighlightFollowsCurrentItem(bool) Q_DECL_OVERRIDE;
+    void setHighlightFollowsCurrentItem(bool) override;
 
     qreal highlightMoveVelocity() const;
     void setHighlightMoveVelocity(qreal);
@@ -157,7 +157,7 @@ public:
     int highlightResizeDuration() const;
     void setHighlightResizeDuration(int);
 
-    void setHighlightMoveDuration(int) Q_DECL_OVERRIDE;
+    void setHighlightMoveDuration(int) override;
 
     enum SnapMode { NoSnap, SnapToItem, SnapOneItem };
     Q_ENUM(SnapMode)
@@ -192,10 +192,12 @@ Q_SIGNALS:
     Q_REVISION(2) void footerPositioningChanged();
 
 protected:
-    void viewportMoved(Qt::Orientations orient) Q_DECL_OVERRIDE;
-    void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
-    void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void initItem(int index, QObject *item) Q_DECL_OVERRIDE;
+    void viewportMoved(Qt::Orientations orient) override;
+    void keyPressEvent(QKeyEvent *) override;
+    void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry) override;
+    void initItem(int index, QObject *item) override;
+    qreal maxYExtent() const override;
+    qreal maxXExtent() const override;
 };
 
 class QQuickListViewAttached : public QQuickItemViewAttached
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index eeec562e3c..5d5934bbd2 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -971,7 +971,7 @@ QV4::ReturnedValue QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Funct
         QV4::ScopedValue v(scope, (*args)[1]);
         if (!v->isObject() || v->as<QV4::ArrayObject>()) {
             *error = true;
-            qmlInfo(loader) << QQuickLoader::tr("setSource: value is not an object");
+            qmlWarning(loader) << QQuickLoader::tr("setSource: value is not an object");
         } else {
             *error = false;
             valuemap = v;
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 79c957832a..2f66bbebf2 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -341,7 +341,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
     position of the release of the click, and whether the click was held.
 
     When handling this signal, changing the \l {MouseEvent::}{accepted} property of the \a mouse
-    parameter has no effect.
+    parameter has no effect, unless the \l propagateComposedEvents property is \c true.
 
     The corresponding handler is \c onClicked.
 */
@@ -385,7 +385,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
     position of the press, and which button is pressed.
 
     When handling this signal, changing the \l {MouseEvent::}{accepted} property of the \a mouse
-    parameter has no effect.
+    parameter has no effect, unless the \l propagateComposedEvents property is \c true.
 
     The corresponding handler is \c onPressAndHold.
 */
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index 706980cd13..62119effb2 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -60,6 +60,8 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING)
 
     The TouchPoint type contains information about a touch point, such as the current
     position, pressure, and area.
+
+    \image touchpoint-metrics.png
 */
 
 /*!
@@ -101,16 +103,29 @@ void QQuickTouchPoint::setY(qreal y)
 }
 
 /*!
+    \qmlproperty size QtQuick::TouchPoint::ellipseDiameters
+    \since 5.9
+
+    This property holds the major and minor axes of the ellipse representing
+    the covered area of the touch point.
+*/
+void QQuickTouchPoint::setEllipseDiameters(const QSizeF &d)
+{
+    if (_ellipseDiameters == d)
+        return;
+    _ellipseDiameters = d;
+    emit ellipseDiametersChanged();
+}
+
+/*!
     \qmlproperty real QtQuick::TouchPoint::pressure
     \qmlproperty vector2d QtQuick::TouchPoint::velocity
-    \qmlproperty rectangle QtQuick::TouchPoint::area
 
     These properties hold additional information about the current state of the touch point.
 
     \list
     \li \c pressure is a value in the range of 0.0 to 1.0.
     \li \c velocity is a vector with magnitude reported in pixels per second.
-    \li \c area is a rectangle covering the area of the touch point, centered on the current position of the touch point.
     \endlist
 
     Not all touch devices support velocity. If velocity is not supported, it will be reported
@@ -124,6 +139,26 @@ void QQuickTouchPoint::setPressure(qreal pressure)
     emit pressureChanged();
 }
 
+/*!
+    \qmlproperty real QtQuick::TouchPoint::rotation
+    \since 5.9
+
+    This property holds the angular orientation of this touch point. The return
+    value is in degrees, where zero (the default) indicates the finger or token
+    is pointing upwards, a negative angle means it's rotated to the left, and a
+    positive angle means it's rotated to the right. Most touchscreens do not
+    detect rotation, so zero is the most common value.
+
+    \sa QTouchEvent::TouchPoint::rotation()
+*/
+void QQuickTouchPoint::setRotation(qreal r)
+{
+    if (_rotation == r)
+        return;
+    _rotation = r;
+    emit rotationChanged();
+}
+
 void QQuickTouchPoint::setVelocity(const QVector2D &velocity)
 {
     if (_velocity == velocity)
@@ -132,6 +167,18 @@ void QQuickTouchPoint::setVelocity(const QVector2D &velocity)
     emit velocityChanged();
 }
 
+/*!
+    \deprecated
+    \qmlproperty rectangle QtQuick::TouchPoint::area
+
+    A rectangle covering the area of the touch point, centered on the current
+    position of the touch point.
+
+    It is deprecated because a touch point is more correctly modeled as an ellipse,
+    whereas this rectangle represents the outer bounds of the ellipse after \l rotation.
+
+    \sa horizontalDiameter, verticalDiameter
+*/
 void QQuickTouchPoint::setArea(const QRectF &area)
 {
     if (_area == area)
@@ -222,6 +269,25 @@ void QQuickTouchPoint::setSceneY(qreal sceneY)
 }
 
 /*!
+    \qmlproperty PointingDeviceUniqueId QtQuick::TouchPoint::uniqueId
+    \since 5.9
+
+    This property holds the unique ID of the touch point or token.
+
+    It is normally empty, because touchscreens cannot uniquely identify fingers.
+    But when it is set, it is expected to uniquely identify a specific token
+    (fiducial object).
+
+    Interpreting the contents of this ID requires knowledge of the hardware and
+    drivers in use (e.g. various TUIO-based touch surfaces).
+*/
+void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id)
+{
+    _uniqueId = id;
+    emit uniqueIdChanged();
+}
+
+/*!
     \qmltype MultiPointTouchArea
     \instantiates QQuickMultiPointTouchArea
     \inqmlmodule QtQuick
@@ -691,9 +757,12 @@ void QQuickMultiPointTouchArea::updateTouchPoint(QQuickTouchPoint *dtp, const QT
 {
     //TODO: if !qmlDefined, could bypass setters.
     //      also, should only emit signals after all values have been set
+    dtp->setUniqueId(p->uniqueId());
     dtp->setX(p->pos().x());
     dtp->setY(p->pos().y());
+    dtp->setEllipseDiameters(p->ellipseDiameters());
     dtp->setPressure(p->pressure());
+    dtp->setRotation(p->rotation());
     dtp->setVelocity(p->velocity());
     dtp->setArea(p->rect());
     dtp->setStartX(p->startPos().x());
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 541eb04764..25e1056712 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -67,10 +67,13 @@ class Q_AUTOTEST_EXPORT QQuickTouchPoint : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int pointId READ pointId NOTIFY pointIdChanged)
+    Q_PROPERTY(QPointingDeviceUniqueId uniqueId READ uniqueId NOTIFY uniqueIdChanged REVISION 9)
     Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
     Q_PROPERTY(qreal x READ x NOTIFY xChanged)
     Q_PROPERTY(qreal y READ y NOTIFY yChanged)
+    Q_PROPERTY(QSizeF ellipseDiameters READ ellipseDiameters NOTIFY ellipseDiametersChanged REVISION 9)
     Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged)
+    Q_PROPERTY(qreal rotation READ rotation NOTIFY rotationChanged REVISION 9)
     Q_PROPERTY(QVector2D velocity READ velocity NOTIFY velocityChanged)
     Q_PROPERTY(QRectF area READ area NOTIFY areaChanged)
 
@@ -86,6 +89,7 @@ public:
         : _id(0),
           _x(0.0), _y(0.0),
           _pressure(0.0),
+          _rotation(0),
           _qmlDefined(qmlDefined),
           _inUse(false),
           _pressed(false),
@@ -97,15 +101,24 @@ public:
     int pointId() const { return _id; }
     void setPointId(int id);
 
+    QPointingDeviceUniqueId uniqueId() const { return _uniqueId; }
+    void setUniqueId(const QPointingDeviceUniqueId &id);
+
     qreal x() const { return _x; }
     void setX(qreal x);
 
     qreal y() const { return _y; }
     void setY(qreal y);
 
+    QSizeF ellipseDiameters() const { return _ellipseDiameters; }
+    void setEllipseDiameters(const QSizeF &d);
+
     qreal pressure() const { return _pressure; }
     void setPressure(qreal pressure);
 
+    qreal rotation() const { return _rotation; }
+    void setRotation(qreal r);
+
     QVector2D velocity() const { return _velocity; }
     void setVelocity(const QVector2D &velocity);
 
@@ -141,9 +154,12 @@ public:
 Q_SIGNALS:
     void pressedChanged();
     void pointIdChanged();
+    Q_REVISION(9) void uniqueIdChanged();
     void xChanged();
     void yChanged();
+    Q_REVISION(9) void ellipseDiametersChanged();
     void pressureChanged();
+    Q_REVISION(9) void rotationChanged();
     void velocityChanged();
     void areaChanged();
     void startXChanged();
@@ -159,6 +175,8 @@ private:
     qreal _x;
     qreal _y;
     qreal _pressure;
+    qreal _rotation;
+    QSizeF _ellipseDiameters;
     QVector2D _velocity;
     QRectF _area;
     bool _qmlDefined;
@@ -170,6 +188,7 @@ private:
     qreal _previousY;
     qreal _sceneX;
     qreal _sceneY;
+    QPointingDeviceUniqueId _uniqueId;
 };
 
 class QQuickGrabGestureEvent : public QObject
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index 11881ae0ab..53e547fe98 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -137,7 +137,7 @@ QQuickItem *QQuickPathViewPrivate::getItem(int modelIndex, qreal z, bool async)
             if (!delegateValidated) {
                 delegateValidated = true;
                 QObject* delegate = q->delegate();
-                qmlInfo(delegate ? delegate : q) << QQuickPathView::tr("Delegate must be of Item type");
+                qmlWarning(delegate ? delegate : q) << QQuickPathView::tr("Delegate must be of Item type");
             }
         }
     } else {
@@ -704,16 +704,23 @@ void QQuickPathView::setPath(QQuickPath *path)
         qmlobject_disconnect(d->path, QQuickPath, SIGNAL(changed()),
                              this, QQuickPathView, SLOT(pathUpdated()));
     d->path = path;
-    qmlobject_connect(d->path, QQuickPath, SIGNAL(changed()),
-                      this, QQuickPathView, SLOT(pathUpdated()));
-    if (d->isValid() && isComponentComplete()) {
+
+    if (path) {
+        qmlobject_connect(d->path, QQuickPath, SIGNAL(changed()),
+                          this, QQuickPathView, SLOT(pathUpdated()));
+    }
+
+    if (isComponentComplete()) {
         d->clear();
-        if (d->attType) {
-            d->attType->release();
-            d->attType = nullptr;
+        if (d->isValid()) {
+            if (d->attType) {
+                d->attType->release();
+                d->attType = nullptr;
+            }
+            d->regenerate();
         }
-        d->regenerate();
     }
+
     emit pathChanged();
 }
 
diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h
index 669ef60ef7..0e237b7b74 100644
--- a/src/quick/items/qquickpathview_p.h
+++ b/src/quick/items/qquickpathview_p.h
@@ -221,14 +221,14 @@ Q_SIGNALS:
     void cacheItemCountChanged();
 
 protected:
-    void updatePolish() Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
+    void updatePolish() override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *) override;
     bool sendMouseEvent(QMouseEvent *event);
-    bool childMouseEventFilter(QQuickItem *, QEvent *) Q_DECL_OVERRIDE;
-    void mouseUngrabEvent() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    bool childMouseEventFilter(QQuickItem *, QEvent *) override;
+    void mouseUngrabEvent() override;
+    void componentComplete() override;
 
 private Q_SLOTS:
     void refill();
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h
index 082f427f2c..d58c986d1a 100644
--- a/src/quick/items/qquickpathview_p_p.h
+++ b/src/quick/items/qquickpathview_p_p.h
@@ -80,7 +80,7 @@ public:
 
     void init();
 
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) Q_DECL_OVERRIDE {
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) override {
         if (change.sizeChange() && (!highlightItem || item != highlightItem)) {
             if (QQuickPathViewAttached *att = attached(item))
                 att->m_percent = -1;
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index e22427ca49..05d3ae0191 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -290,6 +290,11 @@ void QQuickBasePositioner::itemChange(ItemChange change, const ItemChangeData &v
     QQuickItem::itemChange(change, value);
 }
 
+void QQuickBasePositioner::forceLayout()
+{
+    updatePolish();
+}
+
 void QQuickBasePositioner::prePositioning()
 {
     Q_D(QQuickBasePositioner);
@@ -401,6 +406,8 @@ void QQuickBasePositioner::prePositioning()
 
     //Set implicit size to the size of its children
     setImplicitSize(contentSize.width(), contentSize.height());
+
+    emit positioningComplete();
 }
 
 void QQuickBasePositioner::positionItem(qreal x, qreal y, PositionedItem *target)
@@ -910,6 +917,28 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 
   \sa Grid::spacing
 */
+/*!
+    \qmlmethod QtQuick::Column::forceLayout()
+    \since 5.9
+
+    Column typically positions its children once per frame. This means that
+    inside script blocks it is possible for the underlying children to have changed,
+    but the Column to have not yet been updated accordingly.
+
+    This method forces the Column to immediately respond to any outstanding
+    changes in its children.
+
+    \b Note: methods in general should only be called after the Component has completed.
+*/
+/*!
+    \qmlsignal QtQuick::Column::positioningComplete()
+    \since 5.9
+
+    This signal is emitted when positioning has been completed.
+
+    The corresponding handler is \c onPositioningComplete.
+*/
+
 QQuickColumn::QQuickColumn(QQuickItem *parent)
 : QQuickBasePositioner(Vertical, parent)
 {
@@ -957,7 +986,7 @@ void QQuickColumn::reportConflictingAnchors()
         }
     }
     if (d->anchorConflict) {
-        qmlInfo(this) << "Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column."
+        qmlWarning(this) << "Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column."
             << " Column will not function.";
     }
 }
@@ -1077,6 +1106,27 @@ void QQuickColumn::reportConflictingAnchors()
 
   \sa Grid::spacing
 */
+/*!
+    \qmlmethod QtQuick::Row::forceLayout()
+    \since 5.9
+
+    Row typically positions its children once per frame. This means that
+    inside script blocks it is possible for the underlying children to have changed,
+    but the Row to have not yet been updated accordingly.
+
+    This method forces the Row to immediately respond to any outstanding
+    changes in its children.
+
+    \b Note: methods in general should only be called after the Component has completed.
+*/
+/*!
+    \qmlsignal QtQuick::Row::positioningComplete()
+    \since 5.9
+
+    This signal is emitted when positioning has been completed.
+
+    The corresponding handler is \c onPositioningComplete.
+*/
 
 class QQuickRowPrivate : public QQuickBasePositionerPrivate
 {
@@ -1224,7 +1274,7 @@ void QQuickRow::reportConflictingAnchors()
         }
     }
     if (d->anchorConflict)
-        qmlInfo(this) << "Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row."
+        qmlWarning(this) << "Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row."
             << " Row will not function.";
 }
 
@@ -1355,6 +1405,27 @@ void QQuickRow::reportConflictingAnchors()
 
   \sa rows, columns
 */
+/*!
+    \qmlmethod QtQuick::Grid::forceLayout()
+    \since 5.9
+
+    Grid typically positions its children once per frame. This means that
+    inside script blocks it is possible for the underlying children to have changed,
+    but the Grid to have not yet been updated accordingly.
+
+    This method forces the Grid to immediately respond to any outstanding
+    changes in its children.
+
+    \b Note: methods in general should only be called after the Component has completed.
+*/
+/*!
+    \qmlsignal QtQuick::Grid::positioningComplete()
+    \since 5.9
+
+    This signal is emitted when positioning has been completed.
+
+    The corresponding handler is \c onPositioningComplete.
+*/
 
 class QQuickGridPrivate : public QQuickBasePositionerPrivate
 {
@@ -1808,7 +1879,7 @@ void QQuickGrid::reportConflictingAnchors()
         }
     }
     if (d->anchorConflict)
-        qmlInfo(this) << "Cannot specify anchors for items inside Grid." << " Grid will not function.";
+        qmlWarning(this) << "Cannot specify anchors for items inside Grid." << " Grid will not function.";
 }
 
 /*!
@@ -1920,6 +1991,28 @@ void QQuickGrid::reportConflictingAnchors()
 
   \sa Grid::spacing
 */
+/*!
+    \qmlmethod QtQuick::Flow::forceLayout()
+    \since 5.9
+
+    Flow typically positions its children once per frame. This means that
+    inside script blocks it is possible for the underlying children to have changed,
+    but the Flow to have not yet been updated accordingly.
+
+    This method forces the Flow to immediately respond to any outstanding
+    changes in its children.
+
+
+    \b Note: methods in general should only be called after the Component has completed.
+*/
+/*!
+    \qmlsignal QtQuick::Flow::positioningComplete()
+    \since 5.9
+
+    This signal is emitted when positioning has been completed.
+
+    The corresponding handler is \c onPositioningComplete.
+*/
 
 class QQuickFlowPrivate : public QQuickBasePositionerPrivate
 {
@@ -2121,7 +2214,7 @@ void QQuickFlow::reportConflictingAnchors()
         }
     }
     if (d->anchorConflict)
-        qmlInfo(this) << "Cannot specify anchors for items inside Flow." << " Flow will not function.";
+        qmlWarning(this) << "Cannot specify anchors for items inside Flow." << " Flow will not function.";
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index c25ecd6dbc..ae6e795794 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -155,6 +155,8 @@ public:
     void setBottomPadding(qreal padding);
     void resetBottomPadding();
 
+    Q_REVISION(9) Q_INVOKABLE void forceLayout();
+
 protected:
     QQuickBasePositioner(QQuickBasePositionerPrivate &dd, PositionerType at, QQuickItem *parent);
     void componentComplete() Q_DECL_OVERRIDE;
@@ -172,6 +174,7 @@ Q_SIGNALS:
     Q_REVISION(6) void leftPaddingChanged();
     Q_REVISION(6) void rightPaddingChanged();
     Q_REVISION(6) void bottomPaddingChanged();
+    Q_REVISION(9) void positioningComplete();
 
 protected Q_SLOTS:
     void prePositioning();
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index 13e13890b7..03d96aea1f 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -380,6 +380,9 @@ QImage QQuickRenderControl::grab()
 
     if (d->window->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL) {
 #if QT_CONFIG(opengl)
+        QQuickWindowPrivate *cd = QQuickWindowPrivate::get(d->window);
+        cd->polishItems();
+        cd->syncSceneGraph();
         render();
         grabContent = qt_gl_read_framebuffer(d->window->size() * d->window->effectiveDevicePixelRatio(), false, false);
 #endif
@@ -394,6 +397,8 @@ QImage QQuickRenderControl::grab()
             QPaintDevice *prevDev = softwareRenderer->currentPaintDevice();
             softwareRenderer->setCurrentPaintDevice(&grabContent);
             softwareRenderer->markDirty();
+            cd->polishItems();
+            cd->syncSceneGraph();
             render();
             softwareRenderer->setCurrentPaintDevice(prevDev);
         }
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 4f46f41b0d..a7254464ed 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -423,7 +423,7 @@ void QQuickRepeater::initItem(int index, QObject *object)
                 if (!d->delegateValidated) {
                     d->delegateValidated = true;
                     QObject* delegate = this->delegate();
-                    qmlInfo(delegate ? delegate : this) << QQuickRepeater::tr("Delegate must be of Item type");
+                    qmlWarning(delegate ? delegate : this) << QQuickRepeater::tr("Delegate must be of Item type");
                 }
             }
             return;
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index f54a8911b2..d26a1f8a64 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -378,7 +378,7 @@ QImage QQuickSpriteEngine::assembledImage(int maxSize)
     if (!m_errorsPrinted && stat == QQuickPixmap::Error) {
         for (QQuickSprite* s : qAsConst(m_sprites))
             if (s->m_pix.isError())
-                qmlInfo(s) << s->m_pix.error();
+                qmlWarning(s) << s->m_pix.error();
         m_errorsPrinted = true;
     }
 
@@ -399,7 +399,7 @@ QImage QQuickSpriteEngine::assembledImage(int maxSize)
         {
             const QSize frameSize(state->m_frameWidth, state->m_frameHeight);
             if (!(img.size() - frameSize).isValid()) {
-                qmlInfo(state).nospace() << "SpriteEngine: Invalid frame size " << frameSize << "."
+                qmlWarning(state).nospace() << "SpriteEngine: Invalid frame size " << frameSize << "."
                                             " It's bigger than image size " << img.size() << ".";
                 return QImage();
             }
@@ -419,10 +419,10 @@ QImage QQuickSpriteEngine::assembledImage(int maxSize)
             int rowsNeeded = helper::divRoundUp(state->frames(), (maxSize / state->frameWidth()));
             if (h + rowsNeeded * state->frameHeight() > maxSize){
                 if (rowsNeeded * state->frameHeight() > maxSize)
-                    qmlInfo(state) << "SpriteEngine: Animation too large to fit in one texture:" << state->source().toLocalFile();
+                    qmlWarning(state) << "SpriteEngine: Animation too large to fit in one texture:" << state->source().toLocalFile();
                 else
-                    qmlInfo(state) << "SpriteEngine: Animations too large to fit in one texture, pushed over the edge by:" << state->source().toLocalFile();
-                qmlInfo(state) << "SpriteEngine: Your texture max size today is " << maxSize;
+                    qmlWarning(state) << "SpriteEngine: Animations too large to fit in one texture, pushed over the edge by:" << state->source().toLocalFile();
+                qmlWarning(state) << "SpriteEngine: Your texture max size today is " << maxSize;
                 return QImage();
             }
             state->m_generatedCount = rowsNeeded;
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 25a39f951a..858a3c0576 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -209,7 +209,7 @@ QSGSpriteNode *QQuickSpriteSequence::initNode()
     Q_D(QQuickSpriteSequence);
 
     if (!d->m_spriteEngine) {
-        qmlInfo(this) << "No sprite engine...";
+        qmlWarning(this) << "No sprite engine...";
         return nullptr;
     } else if (d->m_spriteEngine->status() == QQuickPixmap::Null) {
         d->m_spriteEngine->startAssemblingImage();
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 9cd3b6a5f5..b40a9e2843 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -78,7 +78,7 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s
         bool ok;
         const QTransform &transform = target->parentItem()->itemTransform(targetParent, &ok);
         if (transform.type() >= QTransform::TxShear || !ok) {
-            qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under complex transform");
+            qmlWarning(q) << QQuickParentChange::tr("Unable to preserve appearance under complex transform");
             ok = false;
         }
 
@@ -89,21 +89,21 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s
             if (transform.m11() == transform.m22())
                 scale = transform.m11();
             else {
-                qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under non-uniform scale");
+                qmlWarning(q) << QQuickParentChange::tr("Unable to preserve appearance under non-uniform scale");
                 ok = false;
             }
         } else if (ok && isRotate) {
             if (transform.m11() == transform.m22())
                 scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
             else {
-                qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under non-uniform scale");
+                qmlWarning(q) << QQuickParentChange::tr("Unable to preserve appearance under non-uniform scale");
                 ok = false;
             }
 
             if (scale != 0)
                 rotation = qAtan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
             else {
-                qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under scale of 0");
+                qmlWarning(q) << QQuickParentChange::tr("Unable to preserve appearance under scale of 0");
                 ok = false;
             }
         }
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index e37a7e6d5e..965fb0102f 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1135,7 +1135,7 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal
                             needToUpdateLayout = true;
                         }
                     } else if (image->pix->isError()) {
-                        qmlInfo(q) << image->pix->error();
+                        qmlWarning(q) << image->pix->error();
                     }
                 }
 
@@ -2795,11 +2795,23 @@ void QQuickText::setRenderType(QQuickText::RenderType renderType)
 
 /*!
     \qmlmethod QtQuick::Text::doLayout()
+    \deprecated
 
-    Triggers a re-layout of the displayed text.
+    Use \l forceLayout() instead.
 */
 void QQuickText::doLayout()
 {
+    forceLayout();
+}
+
+/*!
+    \qmlmethod QtQuick::Text::forceLayout()
+    \since 5.9
+
+    Triggers a re-layout of the displayed text.
+*/
+void QQuickText::forceLayout()
+{
     Q_D(QQuickText);
     d->updateSize();
 }
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 40dbd51f39..c3d3906e7e 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -218,7 +218,8 @@ public:
 
     QRectF boundingRect() const Q_DECL_OVERRIDE;
     QRectF clipRect() const Q_DECL_OVERRIDE;
-    Q_INVOKABLE void doLayout();
+    Q_INVOKABLE void doLayout(); // ### Qt 6: remove
+    Q_REVISION(9) Q_INVOKABLE void forceLayout();
 
     RenderType renderType() const;
     void setRenderType(RenderType renderType);
diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp
index 61d75fe99b..c272503480 100644
--- a/src/quick/items/qquicktextdocument.cpp
+++ b/src/quick/items/qquicktextdocument.cpp
@@ -211,7 +211,7 @@ QQuickPixmap *QQuickTextDocumentWithImageResources::loadPixmap(
     if (p->isError()) {
         if (!errors.contains(url)) {
             errors.insert(url);
-            qmlInfo(parent()) << p->error();
+            qmlWarning(parent()) << p->error();
         }
     }
     return p;
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 106acf57cf..075fd48a46 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -1729,7 +1729,9 @@ void QQuickTextEdit::select(int start, int end)
 
     // QTBUG-11100
     updateSelection();
+#if QT_CONFIG(im)
     updateInputMethod();
+#endif
 }
 
 /*!
@@ -1741,7 +1743,7 @@ void QQuickTextEdit::select(int start, int end)
 bool QQuickTextEdit::isRightToLeft(int start, int end)
 {
     if (start > end) {
-        qmlInfo(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
+        qmlWarning(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
         return false;
     } else {
         return getText(start, end).isRightToLeft();
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 27f3dcecfa..a023ad8a8c 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1152,6 +1152,17 @@ bool QQuickTextInput::hasAcceptableInput() const
     The corresponding handler is \c onEditingFinished.
 */
 
+/*!
+    \qmlsignal QtQuick::TextInput::textEdited()
+    \since 5.9
+
+    This signal is emitted whenever the text is edited. Unlike \c textChanged(),
+    this signal is not emitted when the text is changed programmatically, for example,
+    by changing the value of the \c text property or by calling \c clear().
+
+    The corresponding handler is \c onTextEdited.
+*/
+
 #if QT_CONFIG(im)
 Qt::InputMethodHints QQuickTextInputPrivate::effectiveInputMethodHints() const
 {
@@ -1991,7 +2002,7 @@ void QQuickTextInput::selectAll()
 bool QQuickTextInput::isRightToLeft(int start, int end)
 {
     if (start > end) {
-        qmlInfo(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
+        qmlWarning(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
         return false;
     } else {
         return text().midRef(start, end - start).isRightToLeft();
@@ -3499,7 +3510,7 @@ void QQuickTextInputPrivate::selectWordAtPos(int cursor)
 
     The \a update value is currently unused.
 */
-bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bool /*edited*/)
+bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bool edited)
 {
     Q_Q(QQuickTextInput);
 
@@ -3570,6 +3581,8 @@ bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bo
             m_preeditDirty = false;
 #endif
             alignmentChanged = determineHorizontalAlignment();
+            if (edited)
+                emit q->textEdited();
             emit q->textChanged();
         }
 
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index f4545e1574..c4da807471 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -319,6 +319,7 @@ Q_SIGNALS:
     void accepted();
     void acceptableInputChanged();
     Q_REVISION(2) void editingFinished();
+    Q_REVISION(9) void textEdited();
     void colorChanged();
     void selectionColorChanged();
     void selectedTextColorChanged();
diff --git a/src/quick/items/qquicktextutil.cpp b/src/quick/items/qquicktextutil.cpp
index 8bcdb0b5f6..b07289f4a3 100644
--- a/src/quick/items/qquicktextutil.cpp
+++ b/src/quick/items/qquicktextutil.cpp
@@ -61,7 +61,7 @@ QQuickItem *QQuickTextUtil::createCursor(
                 item->setPosition(rectangle.topLeft());
                 item->setHeight(rectangle.height());
             } else {
-                qmlInfo(parent) << tr("%1 does not support loading non-visual cursor delegates.")
+                qmlWarning(parent) << tr("%1 does not support loading non-visual cursor delegates.")
                         .arg(QString::fromUtf8(className));
             }
             component->completeCreate();
@@ -72,7 +72,7 @@ QQuickItem *QQuickTextUtil::createCursor(
                 parent, SLOT(createCursor()), Qt::UniqueConnection);
         return item;
     }
-    qmlInfo(parent, component->errors()) << tr("Could not load cursor delegate");
+    qmlWarning(parent, component->errors()) << tr("Could not load cursor delegate");
     return item;
 }
 
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index 573440ff7f..d7171bf910 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -62,6 +62,8 @@ void QQuickViewPrivate::init(QQmlEngine* e)
     if (engine.isNull())
         engine = new QQmlEngine(q);
 
+    QQmlEngine::setContextForObject(contentItem, engine.data()->rootContext());
+
     if (!engine.data()->incubationController())
         engine.data()->setIncubationController(q->incubationController());
 
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index 1fcc34e3a1..6d3b30e4c4 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -97,14 +97,14 @@ private Q_SLOTS:
     void continueExecute();
 
 protected:
-    void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE;
-    void timerEvent(QTimerEvent*) Q_DECL_OVERRIDE;
-
-    void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent *) override;
+    void timerEvent(QTimerEvent*) override;
+
+    void keyPressEvent(QKeyEvent *) override;
+    void keyReleaseEvent(QKeyEvent *) override;
+    void mousePressEvent(QMouseEvent *) override;
+    void mouseReleaseEvent(QMouseEvent *) override;
+    void mouseMoveEvent(QMouseEvent *) override;
 private:
     Q_DISABLE_COPY(QQuickView)
     Q_DECLARE_PRIVATE(QQuickView)
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index a090bdc9f7..f92d4b95d6 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -88,7 +88,7 @@ public:
     ~QQuickViewPrivate();
 
     void execute();
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) Q_DECL_OVERRIDE;
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) override;
     void initResize();
     void updateSize();
     void setRootObject(QObject *);
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 07d87989b5..660c5f8067 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2083,11 +2083,12 @@ void QQuickWindowPrivate::flushFrameSynchronousEvents()
             ut->startAnimations();
     }
 
-    // Once per frame, send a synthetic hover, in case items have changed position.
+    // Once per frame, if any items are dirty, send a synthetic hover,
+    // in case items have changed position, visibility, etc.
     // For instance, during animation (including the case of a ListView
     // whose delegates contain MouseAreas), a MouseArea needs to know
     // whether it has moved into a position where it is now under the cursor.
-    if (!q->mouseGrabberItem() && !lastMousePosition.isNull()) {
+    if (!q->mouseGrabberItem() && !lastMousePosition.isNull() && dirtyItemList) {
         bool accepted = false;
         bool delivered = deliverHoverEvent(contentItem, lastMousePosition, lastMousePosition, QGuiApplication::keyboardModifiers(), 0, accepted);
         if (!delivered)
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index ea1fc2f106..42313e4584 100644
--- a/src/quick/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -102,6 +102,9 @@ void QQuickWindowQmlImpl::classBegin()
 {
     Q_D(QQuickWindowQmlImpl);
     QQmlEngine* e = qmlEngine(this);
+
+    QQmlEngine::setContextForObject(contentItem(), e->rootContext());
+
     //Give QQuickView behavior when created from QML with QQmlApplicationEngine
     if (QCoreApplication::instance()->property("__qml_using_qqmlapplicationengine") == QVariant(true)) {
         if (e && !e->incubationController())