From 5f4f57966127c6faa1f3c245deca54af97c7a395 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 18 Oct 2017 13:25:28 +0200 Subject: Revert "SwipeDelegate: grab the mouse when accepting a press event" This partially reverts commit 31d90e308e46d644d74e9434ce31dd664677bc59 without bringing back the blacklists that were added in commit 4d12ab2c6a62e2771e7cc9c2c67ab48962987421. These explicit grab calls are no longer needed. The root cause was fixed in qtdeclarative commit 2dd530ca35032465d4e928aa7c8f29563eb0c5da. Change-Id: Ie22b05ee00cd6e104d99732eddcd9d0652b6a7e0 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickswipedelegate.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/quicktemplates2/qquickswipedelegate.cpp') diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index 92a5328d..0524b2cc 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -737,7 +737,6 @@ bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseE // so we correct it after calling the base class' mousePressEvent(), rather // than having to duplicate its code just so we can set the pressPoint. pressPoint = item->mapToItem(q, event->pos()); - q->grabMouse(); return true; } @@ -754,7 +753,6 @@ bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseE attached->setPressed(true); // Stop the event from propagating, as QQuickItem explicitly ignores events. event->accept(); - item->grabMouse(); return true; } -- cgit v1.2.3