Merge remote-tracking branch 'origin/5.9.0' into 5.9

Change-Id: I3f77593ca944114534fff5df26bbb09150ee4400

3 files changed, 54 insertions, 48 deletions

diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 323ecfa4ff..3735d68a85 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -501,7 +501,6 @@ public:
       : m_deviceType(devType), m_pointerType(pType), m_capabilities(caps)
       , m_maximumTouchPoints(maxPoints), m_buttonCount(buttonCount), m_name(name)
       , m_uniqueId(QPointingDeviceUniqueId::fromNumericId(uniqueId))
-      , m_event(nullptr)
     {
     }
 
@@ -514,8 +513,6 @@ public:
     QString name() const { return m_name; }
     QPointingDeviceUniqueId uniqueId() const { return m_uniqueId; }
 
-    QQuickPointerEvent *pointerEvent() const { return m_event; } // deprecated
-
     static QQuickPointerDevice *touchDevice(QTouchDevice *d);
     static QList<QQuickPointerDevice *> touchDevices();
     static QQuickPointerDevice *genericMouseDevice();
@@ -530,10 +527,6 @@ private:
     QString m_name;
     QPointingDeviceUniqueId m_uniqueId;
 
-    // the event instance used last time within the context of one window
-    QQuickPointerEvent *m_event; // deprecated
-    friend class QQuickWindowPrivate; // not needed after removing the above
-
     Q_DISABLE_COPY(QQuickPointerDevice)
 };
 
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 5f5611d711..549575a97f 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -146,8 +146,8 @@ QQuickTransform::QQuickTransform(QQuickTransformPrivate &dd, QObject *parent)
 QQuickTransform::~QQuickTransform()
 {
     Q_D(QQuickTransform);
-    for (QQuickItem *item : qAsConst(d->items)) {
-        QQuickItemPrivate *p = QQuickItemPrivate::get(item);
+    for (int ii = 0; ii < d->items.count(); ++ii) {
+        QQuickItemPrivate *p = QQuickItemPrivate::get(d->items.at(ii));
         p->transforms.removeOne(this);
         p->dirty(QQuickItemPrivate::Transform);
     }
@@ -156,8 +156,8 @@ QQuickTransform::~QQuickTransform()
 void QQuickTransform::update()
 {
     Q_D(QQuickTransform);
-    for (QQuickItem *item : qAsConst(d->items)) {
-        QQuickItemPrivate *p = QQuickItemPrivate::get(item);
+    for (int ii = 0; ii < d->items.count(); ++ii) {
+        QQuickItemPrivate *p = QQuickItemPrivate::get(d->items.at(ii));
         p->dirty(QQuickItemPrivate::Transform);
     }
 }
@@ -169,7 +169,9 @@ QQuickContents::QQuickContents(QQuickItem *item)
 
 QQuickContents::~QQuickContents()
 {
-    for (QQuickItem *child : m_item->childItems()) {
+    QList<QQuickItem *> children = m_item->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QQuickItem *child = children.at(i);
         QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
     }
 }
@@ -192,8 +194,9 @@ bool QQuickContents::calcHeight(QQuickItem *changed)
     } else {
         qreal top = std::numeric_limits<qreal>::max();
         qreal bottom = -std::numeric_limits<qreal>::max();
-        const QList<QQuickItem*> children = m_item->childItems();
-        for (QQuickItem *child : qAsConst(children)) {
+        QList<QQuickItem *> children = m_item->childItems();
+        for (int i = 0; i < children.count(); ++i) {
+            QQuickItem *child = children.at(i);
             qreal y = child->y();
             if (y + child->height() > bottom)
                 bottom = y + child->height();
@@ -226,8 +229,9 @@ bool QQuickContents::calcWidth(QQuickItem *changed)
     } else {
         qreal left = std::numeric_limits<qreal>::max();
         qreal right = -std::numeric_limits<qreal>::max();
-        const QList<QQuickItem*> children = m_item->childItems();
-        for (QQuickItem *child : qAsConst(children)) {
+        QList<QQuickItem *> children = m_item->childItems();
+        for (int i = 0; i < children.count(); ++i) {
+            QQuickItem *child = children.at(i);
             qreal x = child->x();
             if (x + child->width() > right)
                 right = x + child->width();
@@ -246,7 +250,9 @@ void QQuickContents::complete()
 {
     QQuickItemPrivate::get(m_item)->addItemChangeListener(this, QQuickItemPrivate::Children);
 
-    for (QQuickItem *child : m_item->childItems()) {
+    QList<QQuickItem *> children = m_item->childItems();
+    for (int i = 0; i < children.count(); ++i) {
+        QQuickItem *child = children.at(i);
         QQuickItemPrivate::get(child)->addItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
         //###what about changes to visibility?
     }
@@ -1347,7 +1353,8 @@ void QQuickKeysAttached::componentComplete()
 #if QT_CONFIG(im)
     Q_D(QQuickKeysAttached);
     if (d->item) {
-        for (QQuickItem *targetItem : qAsConst(d->targets)) {
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QQuickItem *targetItem = d->targets.at(ii);
             if (targetItem && (targetItem->flags() & QQuickItem::ItemAcceptsInputMethod)) {
                 d->item->setFlag(QQuickItem::ItemAcceptsInputMethod);
                 break;
@@ -1369,10 +1376,11 @@ void QQuickKeysAttached::keyPressed(QKeyEvent *event, bool post)
     // first process forwards
     if (d->item && d->item->window()) {
         d->inPress = true;
-        for (QQuickItem *targetItem : qAsConst(d->targets)) {
-            if (targetItem && targetItem->isVisible()) {
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QQuickItem *i = d->targets.at(ii);
+            if (i && i->isVisible()) {
                 event->accept();
-                QCoreApplication::sendEvent(targetItem, event);
+                QCoreApplication::sendEvent(i, event);
                 if (event->isAccepted()) {
                     d->inPress = false;
                     return;
@@ -1412,10 +1420,11 @@ void QQuickKeysAttached::keyReleased(QKeyEvent *event, bool post)
 
     if (d->item && d->item->window()) {
         d->inRelease = true;
-        for (QQuickItem *targetItem : qAsConst(d->targets)) {
-            if (targetItem && targetItem->isVisible()) {
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QQuickItem *i = d->targets.at(ii);
+            if (i && i->isVisible()) {
                 event->accept();
-                QCoreApplication::sendEvent(targetItem, event);
+                QCoreApplication::sendEvent(i, event);
                 if (event->isAccepted()) {
                     d->inRelease = false;
                     return;
@@ -1439,7 +1448,8 @@ void QQuickKeysAttached::inputMethodEvent(QInputMethodEvent *event, bool post)
     Q_D(QQuickKeysAttached);
     if (post == m_processPost && d->item && !d->inIM && d->item->window()) {
         d->inIM = true;
-        for (QQuickItem *targetItem : qAsConst(d->targets)) {
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QQuickItem *targetItem = d->targets.at(ii);
             if (targetItem && targetItem->isVisible() && (targetItem->flags() & QQuickItem::ItemAcceptsInputMethod)) {
                 QCoreApplication::sendEvent(targetItem, event);
                 if (event->isAccepted()) {
@@ -1458,12 +1468,13 @@ QVariant QQuickKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
 {
     Q_D(const QQuickKeysAttached);
     if (d->item) {
-        for (QQuickItem *targetItem : qAsConst(d->targets)) {
-            if (targetItem && targetItem->isVisible() && (targetItem->flags() & QQuickItem::ItemAcceptsInputMethod) && targetItem == d->imeItem) {
-                //### how robust is targetItem == d->imeItem check?
-                QVariant v = targetItem->inputMethodQuery(query);
+        for (int ii = 0; ii < d->targets.count(); ++ii) {
+            QQuickItem *i = d->targets.at(ii);
+            if (i && i->isVisible() && (i->flags() & QQuickItem::ItemAcceptsInputMethod) && i == d->imeItem) {
+                //### how robust is i == d->imeItem check?
+                QVariant v = i->inputMethodQuery(query);
                 if (v.userType() == QVariant::RectF)
-                    v = d->item->mapRectFromItem(targetItem, v.toRectF());  //### cost?
+                    v = d->item->mapRectFromItem(i, v.toRectF());  //### cost?
                 return v;
             }
         }
@@ -1637,9 +1648,11 @@ void QQuickItemPrivate::setImplicitLayoutMirror(bool mirror, bool inherit)
 
     if (isMirrorImplicit)
         setLayoutMirror(inherit ? inheritedLayoutMirror : false);
-    for (QQuickItem *child : qAsConst(childItems)) {
-        QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(child);
-        childPrivate->setImplicitLayoutMirror(inheritedLayoutMirror, inheritMirrorFromParent);
+    for (int i = 0; i < childItems.count(); ++i) {
+        if (QQuickItem *child = qmlobject_cast<QQuickItem *>(childItems.at(i))) {
+            QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(child);
+            childPrivate->setImplicitLayoutMirror(inheritedLayoutMirror, inheritMirrorFromParent);
+        }
     }
 }
 
@@ -2395,7 +2408,8 @@ QQuickItem::~QQuickItem()
        remove themselves from our list of transforms when that list has already
        been destroyed after ~QQuickItem() has run.
     */
-    for (QQuickTransform *t : qAsConst(d->transforms)) {
+    for (int ii = 0; ii < d->transforms.count(); ++ii) {
+        QQuickTransform *t = d->transforms.at(ii);
         QQuickTransformPrivate *tp = QQuickTransformPrivate::get(t);
         tp->items.removeOne(this);
     }
@@ -2886,8 +2900,8 @@ QList<QQuickItem *> QQuickItemPrivate::paintOrderChildItems() const
     // If none of the items have set Z then the paint order list is the same as
     // the childItems list.  This is by far the most common case.
     bool haveZ = false;
-    for (QQuickItem *childItem : qAsConst(childItems)) {
-        if (QQuickItemPrivate::get(childItem)->z() != 0.) {
+    for (int i = 0; i < childItems.count(); ++i) {
+        if (QQuickItemPrivate::get(childItems.at(i))->z() != 0.) {
             haveZ = true;
             break;
         }
@@ -2988,7 +3002,8 @@ void QQuickItemPrivate::refWindow(QQuickWindow *c)
     if (!parentItem)
         QQuickWindowPrivate::get(window)->parentlessItems.insert(q);
 
-    for (QQuickItem *child : qAsConst(childItems)) {
+    for (int ii = 0; ii < childItems.count(); ++ii) {
+        QQuickItem *child = childItems.at(ii);
         QQuickItemPrivate::get(child)->refWindow(c);
     }
 
@@ -3040,7 +3055,8 @@ void QQuickItemPrivate::derefWindow()
 
     paintNode = 0;
 
-    for (QQuickItem *child : qAsConst(childItems)) {
+    for (int ii = 0; ii < childItems.count(); ++ii) {
+        QQuickItem *child = childItems.at(ii);
         QQuickItemPrivate::get(child)->derefWindow();
     }
 
@@ -3485,7 +3501,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop)
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
 
-    for (QQuickTransform *t : qAsConst(p->transforms)) {
+    for (int ii = 0; ii < p->transforms.count(); ++ii) {
+        QQuickTransform *t = p->transforms.at(ii);
         QQuickTransformPrivate *tp = QQuickTransformPrivate::get(t);
         tp->items.removeOne(that);
     }
@@ -5850,9 +5867,8 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
     }
 
     bool childVisibilityChanged = false;
-    for (QQuickItem *childItem : qAsConst(childItems)) {
-        childVisibilityChanged |= QQuickItemPrivate::get(childItem)->setEffectiveVisibleRecur(newEffectiveVisible);
-    }
+    for (int ii = 0; ii < childItems.count(); ++ii)
+        childVisibilityChanged |= QQuickItemPrivate::get(childItems.at(ii))->setEffectiveVisibleRecur(newEffectiveVisible);
 
     itemChange(QQuickItem::ItemVisibleHasChanged, effectiveVisible);
 #if QT_CONFIG(accessibility)
@@ -5901,8 +5917,8 @@ void QQuickItemPrivate::setEffectiveEnableRecur(QQuickItem *scope, bool newEffec
         }
     }
 
-    for (QQuickItem *childItem : qAsConst(childItems)) {
-        QQuickItemPrivate::get(childItem)->setEffectiveEnableRecur(
+    for (int ii = 0; ii < childItems.count(); ++ii) {
+        QQuickItemPrivate::get(childItems.at(ii))->setEffectiveEnableRecur(
                 (flags & QQuickItem::ItemIsFocusScope) && scope ? q : scope, newEffectiveEnable);
     }
 
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 67069c7d15..ff4a357641 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2117,10 +2117,8 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QQuickPointerDevic
 {
     // the list of devices should be very small so a linear search should be ok
     for (QQuickPointerEvent *e: pointerEventInstances) {
-        if (e->device() == device) {
-            device->m_event = e;
+        if (e->device() == device)
             return e;
-        }
     }
 
     QQuickPointerEvent *ev = nullptr;
@@ -2138,7 +2136,6 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QQuickPointerDevic
         break;
     }
     pointerEventInstances << ev;
-    device->m_event = ev;
     return ev;
 }