diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 09:34:06 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 09:34:26 +0200 |
commit | ef63be14186607c2b806f45d257d8aba6e9a6472 (patch) | |
tree | f86e663d32e2ad8cfd6ac307dd11526e561c66ba /src/quicktemplates2/qquickdrawer.cpp | |
parent | 7eace7ac5a74b68338b948857c4f2bc2e58abc48 (diff) | |
parent | d6c8721476607f22896785baa547a7551015f164 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Idb1895dae2870dbed860ba3106fe52b01d733504
Diffstat (limited to 'src/quicktemplates2/qquickdrawer.cpp')
-rw-r--r-- | src/quicktemplates2/qquickdrawer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 007ce4e6..96d48f08 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -357,10 +357,10 @@ bool QQuickDrawerPrivate::grabMouse(QQuickItem *item, QMouseEvent *event) bool QQuickDrawerPrivate::grabTouch(QQuickItem *item, QTouchEvent *event) { Q_Q(QQuickDrawer); - handleTouchEvent(item, event); + bool handled = handleTouchEvent(item, event); if (!window || !interactive || popupItem->keepTouchGrab() || !event->touchPointStates().testFlag(Qt::TouchPointMoved)) - return false; + return handled; bool overThreshold = false; for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { |