MouseArea: press not accepted means not pressed

This changes that items that explicitly do not accept a press
event, will no longer get a cancel event.

[ChangeLog][QtQuick] MouseArea no longer thinks it's pressed when
it does not accept the press event. When a press event is not accepted,
MouseArea also no longer receives a cancel event.

Change-Id: I8419cef60d7cc32aab15e9027fafb73cc08001ba
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 33cc6c9a63..0118d882af 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -405,8 +405,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
 /*!
     \qmlsignal QtQuick::MouseArea::canceled()
 
-    This signal is emitted when mouse events have been canceled, either because an event was not accepted, or
-    because another item stole the mouse event handling.
+    This signal is emitted when mouse events have been canceled, because another item stole the mouse event handling.
 
     This signal is for advanced use: it is useful when there is more than one MouseArea
     that is handling input, or when there is a MouseArea inside a \l Flickable. In the latter
@@ -1198,6 +1197,11 @@ bool QQuickMouseArea::setPressed(Qt::MouseButton button, bool p, Qt::MouseEventS
             emit mouseXChanged(&me);
             me.setPosition(d->lastPos);
             emit mouseYChanged(&me);
+
+            if (!me.isAccepted()) {
+                d->pressed = Qt::NoButton;
+            }
+
             if (!oldPressed) {
                 emit pressedChanged();
                 emit containsPressChanged();