diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:58 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-12 12:00:31 +0200 |
| commit | b0a4c4808f54a2cbe64a75f1a5a341be420b584c (patch) | |
| tree | d71f43142497c03df9fe7826b52512c4ed2153ef /src/quick/handlers/qquicksinglepointhandler.cpp | |
| parent | 47ad6c57d1873c3da362cfad7cc81dc0aa2720a4 (diff) | |
| parent | f3d40896c1d8601703fcbf30214e22f50eb72727 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Required a change to a #include; qquicksinglepointhandler.cpp was (at
least on Android) only seeing QQuickSinglePointHandler as a forward
declaration, so dereferencing it was a problem. The header that
defines it does #include the one it replaces here.
Change-Id: I6bc30ff9a91f55350172e4a4bcaaa7f99a2ffb28
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 c0fa39fad3..15fe0cc89e 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. |