Merge remote-tracking branch 'origin/5.11' into 5.12

 Conflicts:
	src/3rdparty/masm/yarr/YarrJIT.h
	src/quick/items/qquickwindow.cpp

Change-Id: I551404e1558d56c0b0626346ad1c86406bff0ec7

5 files changed, 103 insertions, 39 deletions

diff --git a/src/quick/doc/src/includes/item.qdocinc b/src/quick/doc/src/includes/item.qdocinc
index 12472cb928..4cb2652bbf 100644
--- a/src/quick/doc/src/includes/item.qdocinc
+++ b/src/quick/doc/src/includes/item.qdocinc
@@ -4,3 +4,12 @@ The following properties of the item are used in the mapping:
 \l x, \l y, \l scale, \l rotation, \l transformOrigin, and \l [QML]{Item::}{transform}.
 
 //! [mapping]
+
+
+//! [accepting-events]
+
+The event is accepted by default, so it is not necessary to explicitly
+accept the event if you reimplement this function. If you don't accept the
+event, call \c event->ignore().
+
+//! [accepting-events]
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index f7e7a1b773..eba3842c10 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -3919,6 +3919,16 @@ void QQuickItemPrivate::addItemChangeListener(QQuickItemChangeListener *listener
     changeListeners.append(ChangeListener(listener, types));
 }
 
+void QQuickItemPrivate::updateOrAddItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types)
+{
+    const ChangeListener changeListener(listener, types);
+    const int index = changeListeners.indexOf(changeListener);
+    if (index > -1)
+        changeListeners[index].types = changeListener.types;
+    else
+        changeListeners.append(changeListener);
+}
+
 void QQuickItemPrivate::removeItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types)
 {
     ChangeListener change(listener, types);
@@ -3953,6 +3963,8 @@ void QQuickItemPrivate::updateOrRemoveGeometryChangeListener(QQuickItemChangeLis
     This event handler can be reimplemented in a subclass to receive key
     press events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::keyPressEvent(QKeyEvent *event)
 {
@@ -3963,6 +3975,8 @@ void QQuickItem::keyPressEvent(QKeyEvent *event)
     This event handler can be reimplemented in a subclass to receive key
     release events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::keyReleaseEvent(QKeyEvent *event)
 {
@@ -3974,6 +3988,8 @@ void QQuickItem::keyReleaseEvent(QKeyEvent *event)
     This event handler can be reimplemented in a subclass to receive input
     method events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::inputMethodEvent(QInputMethodEvent *event)
 {
@@ -3985,6 +4001,11 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event)
     This event handler can be reimplemented in a subclass to receive focus-in
     events for an item. The event information is provided by the \c event
     parameter.
+
+    \input item.qdocinc accepting-events
+
+    If you do reimplement this function, you should call the base class
+    implementation.
   */
 void QQuickItem::focusInEvent(QFocusEvent * /*event*/)
 {
@@ -4002,6 +4023,8 @@ void QQuickItem::focusInEvent(QFocusEvent * /*event*/)
     This event handler can be reimplemented in a subclass to receive focus-out
     events for an item. The event information is provided by the \c event
     parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::focusOutEvent(QFocusEvent * /*event*/)
 {
@@ -4011,6 +4034,8 @@ void QQuickItem::focusOutEvent(QFocusEvent * /*event*/)
     This event handler can be reimplemented in a subclass to receive mouse
     press events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::mousePressEvent(QMouseEvent *event)
 {
@@ -4021,6 +4046,8 @@ void QQuickItem::mousePressEvent(QMouseEvent *event)
     This event handler can be reimplemented in a subclass to receive mouse
     move events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::mouseMoveEvent(QMouseEvent *event)
 {
@@ -4031,6 +4058,8 @@ void QQuickItem::mouseMoveEvent(QMouseEvent *event)
     This event handler can be reimplemented in a subclass to receive mouse
     release events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::mouseReleaseEvent(QMouseEvent *event)
 {
@@ -4041,6 +4070,8 @@ void QQuickItem::mouseReleaseEvent(QMouseEvent *event)
     This event handler can be reimplemented in a subclass to receive mouse
     double-click events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::mouseDoubleClickEvent(QMouseEvent *)
 {
@@ -4050,7 +4081,7 @@ void QQuickItem::mouseDoubleClickEvent(QMouseEvent *)
     This event handler can be reimplemented in a subclass to be notified
     when a mouse ungrab event has occurred on this item.
 
-    \sa ungrabMouse()
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::mouseUngrabEvent()
 {
@@ -4060,6 +4091,8 @@ void QQuickItem::mouseUngrabEvent()
 /*!
     This event handler can be reimplemented in a subclass to be notified
     when a touch ungrab event has occurred on this item.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::touchUngrabEvent()
 {
@@ -4071,6 +4104,8 @@ void QQuickItem::touchUngrabEvent()
     This event handler can be reimplemented in a subclass to receive
     wheel events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::wheelEvent(QWheelEvent *event)
 {
@@ -4082,6 +4117,8 @@ void QQuickItem::wheelEvent(QWheelEvent *event)
     This event handler can be reimplemented in a subclass to receive touch
     events for an item. The event information is provided by the
     \a event parameter.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::touchEvent(QTouchEvent *event)
 {
@@ -4094,6 +4131,8 @@ void QQuickItem::touchEvent(QTouchEvent *event)
     \a event parameter.
 
     Hover events are only provided if acceptHoverEvents() is true.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::hoverEnterEvent(QHoverEvent *event)
 {
@@ -4106,6 +4145,8 @@ void QQuickItem::hoverEnterEvent(QHoverEvent *event)
     \a event parameter.
 
     Hover events are only provided if acceptHoverEvents() is true.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::hoverMoveEvent(QHoverEvent *event)
 {
@@ -4118,6 +4159,8 @@ void QQuickItem::hoverMoveEvent(QHoverEvent *event)
     \a event parameter.
 
     Hover events are only provided if acceptHoverEvents() is true.
+
+    \input item.qdocinc accepting-events
   */
 void QQuickItem::hoverLeaveEvent(QHoverEvent *event)
 {
@@ -4133,6 +4176,8 @@ void QQuickItem::hoverLeaveEvent(QHoverEvent *event)
     Drag and drop events are only provided if the ItemAcceptsDrops flag
     has been set for this item.
 
+    \input item.qdocinc accepting-events
+
     \sa Drag, {Drag and Drop}
   */
 void QQuickItem::dragEnterEvent(QDragEnterEvent *event)
@@ -4148,6 +4193,8 @@ void QQuickItem::dragEnterEvent(QDragEnterEvent *event)
     Drag and drop events are only provided if the ItemAcceptsDrops flag
     has been set for this item.
 
+    \input item.qdocinc accepting-events
+
     \sa Drag, {Drag and Drop}
   */
 void QQuickItem::dragMoveEvent(QDragMoveEvent *event)
@@ -4163,6 +4210,8 @@ void QQuickItem::dragMoveEvent(QDragMoveEvent *event)
     Drag and drop events are only provided if the ItemAcceptsDrops flag
     has been set for this item.
 
+    \input item.qdocinc accepting-events
+
     \sa Drag, {Drag and Drop}
   */
 void QQuickItem::dragLeaveEvent(QDragLeaveEvent *event)
@@ -4178,6 +4227,8 @@ void QQuickItem::dragLeaveEvent(QDragLeaveEvent *event)
     Drag and drop events are only provided if the ItemAcceptsDrops flag
     has been set for this item.
 
+    \input item.qdocinc accepting-events
+
     \sa Drag, {Drag and Drop}
   */
 void QQuickItem::dropEvent(QDropEvent *event)
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 24941ab264..11b47114cf 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -415,6 +415,7 @@ public:
     QVector<QQuickItemPrivate::ChangeListener> changeListeners;
 
     void addItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types);
+    void updateOrAddItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types);
     void removeItemChangeListener(QQuickItemChangeListener *, ChangeTypes types);
     void updateOrAddGeometryChangeListener(QQuickItemChangeListener *listener, QQuickGeometryChange types);
     void updateOrRemoveGeometryChangeListener(QQuickItemChangeListener *listener, QQuickGeometryChange types);
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 8caa568a6c..059886f41c 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1738,48 +1738,49 @@ void QQuickWindowPrivate::deliverToPassiveGrabbers(const QVector<QPointer <QQuic
 
 void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEvent)
 {
+    Q_Q(QQuickWindow);
     auto point = pointerEvent->point(0);
     lastMousePosition = point->scenePosition();
     const bool mouseIsReleased = (point->state() == QQuickEventPoint::Released && pointerEvent->buttons() == Qt::NoButton);
+    QQuickItem *grabberItem = point->grabberItem();
+    if (!grabberItem && isDeliveringTouchAsMouse())
+        grabberItem = q->mouseGrabberItem();
 
-    if (point->exclusiveGrabber()) {
-        if (auto grabber = point->grabberItem()) {
-            bool handled = false;
-            hasFiltered.clear();
-            if (sendFilteredPointerEvent(pointerEvent, grabber))
-                handled = true;
-            // if the grabber is an Item:
-            // if the update consists of changing button state, don't accept it unless
-            // the button is one in which the grabber is interested
-            Qt::MouseButtons acceptedButtons = grabber->acceptedMouseButtons();
-            if (!handled && pointerEvent->button() != Qt::NoButton && acceptedButtons
-                    && !(acceptedButtons & pointerEvent->button())) {
-                pointerEvent->setAccepted(false);
-                handled = true;
-            }
-
-            // send update
-            if (!handled) {
-                QPointF localPos = grabber->mapFromScene(lastMousePosition);
-                auto me = pointerEvent->asMouseEvent(localPos);
-                me->accept();
-                QCoreApplication::sendEvent(grabber, me);
-                point->setAccepted(me->isAccepted());
-            }
+    if (grabberItem) {
+        bool handled = false;
+        hasFiltered.clear();
+        if (sendFilteredPointerEvent(pointerEvent, grabberItem))
+            handled = true;
+        // if the grabber is an Item:
+        // if the update consists of changing button state, don't accept it unless
+        // the button is one in which the grabber is interested
+        Qt::MouseButtons acceptedButtons = grabberItem->acceptedMouseButtons();
+        if (!handled && pointerEvent->button() != Qt::NoButton && acceptedButtons
+                && !(acceptedButtons & pointerEvent->button())) {
+            pointerEvent->setAccepted(false);
+            handled = true;
+        }
 
-            // release event: ungrab if no buttons are pressed anymore
-            if (mouseIsReleased)
-                removeGrabber(grabber, true, isDeliveringTouchAsMouse());
-        } else {
-            // if the grabber is not an Item, it must be a PointerHandler
-            auto handler = point->grabberPointerHandler();
-            pointerEvent->localize(handler->parentItem());
-            hasFiltered.clear();
-            if (!sendFilteredPointerEvent(pointerEvent, handler->parentItem()))
-                handler->handlePointerEvent(pointerEvent);
-            if (mouseIsReleased)
-                point->setGrabberPointerHandler(nullptr, true);
+        // send update
+        if (!handled) {
+            QPointF localPos = grabberItem->mapFromScene(lastMousePosition);
+            auto me = pointerEvent->asMouseEvent(localPos);
+            me->accept();
+            QCoreApplication::sendEvent(grabberItem, me);
+            point->setAccepted(me->isAccepted());
         }
+
+        // release event: ungrab if no buttons are pressed anymore
+        if (mouseIsReleased)
+            removeGrabber(grabberItem, true, isDeliveringTouchAsMouse());
+        deliverToPassiveGrabbers(point->passiveGrabbers(), pointerEvent);
+    } else if (auto handler = point->grabberPointerHandler()) {
+        pointerEvent->localize(handler->parentItem());
+        hasFiltered.clear();
+        if (!sendFilteredPointerEvent(pointerEvent, handler->parentItem()))
+            handler->handlePointerEvent(pointerEvent);
+        if (mouseIsReleased)
+            point->setGrabberPointerHandler(nullptr, true);
         deliverToPassiveGrabbers(point->passiveGrabbers(), pointerEvent);
     } else {
         bool delivered = false;
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 6574f8f67e..03be78ab15 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -217,8 +217,10 @@ void QQuickAnimatorProxyJob::setWindow(QQuickWindow *window)
 
 void QQuickAnimatorProxyJob::sceneGraphInitialized()
 {
-    disconnect(m_controller->window(), &QQuickWindow::sceneGraphInitialized, this, &QQuickAnimatorProxyJob::sceneGraphInitialized);
-    readyToAnimate();
+    if (m_controller) {
+        disconnect(m_controller->window(), &QQuickWindow::sceneGraphInitialized, this, &QQuickAnimatorProxyJob::sceneGraphInitialized);
+        readyToAnimate();
+    }
 }
 
 void QQuickAnimatorProxyJob::readyToAnimate()