diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 16:20:22 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 16:20:22 +0200 |
commit | 36990a732eab2dc16bee89715662f6d3d8b3a0cd (patch) | |
tree | d835ba67426e12e51dc1028e8ebac9087a3d43b0 /src/quick/handlers/qquicksinglepointhandler.cpp | |
parent | cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b (diff) | |
parent | d1b72c98b4e617530bfb23c3a5b7ebc68c15c089 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I507e252f9cb11b75dd9f7f409c39d93094e8c3ef
Diffstat (limited to 'src/quick/handlers/qquicksinglepointhandler.cpp')
-rw-r--r-- | src/quick/handlers/qquicksinglepointhandler.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp index 234bc3c75a..b51f53b74f 100644 --- a/src/quick/handlers/qquicksinglepointhandler.cpp +++ b/src/quick/handlers/qquicksinglepointhandler.cpp @@ -74,9 +74,6 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) Q_D(QQuickSinglePointHandler); if (!QQuickPointerDeviceHandler::wantsPointerEvent(event)) return false; - if (event->device()->pointerType() != QQuickPointerDevice::Finger && - (event->buttons() & acceptedButtons()) == 0 && (event->button() & acceptedButtons()) == 0) - return false; if (d->pointInfo.id()) { // We already know which one we want, so check whether it's there. |