diff options
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 7 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index ac6692365f..1e08a0117f 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1647,7 +1647,7 @@ bool QQuickWindowPrivate::deliverInitialMousePressEvent(QMouseEvent *event) return false; } -bool QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event) +void QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event) { Q_Q(QQuickWindow); @@ -1661,7 +1661,7 @@ bool QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event) event->accept(); else event->ignore(); - return event->isAccepted(); + return; } if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { @@ -1670,10 +1670,7 @@ bool QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event) me->accept(); q->sendEvent(mouseGrabberItem, me.data()); event->setAccepted(me->isAccepted()); - return me->isAccepted(); } - - return false; } bool QQuickWindowPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item, diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 5978a7309f..6391d76687 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -146,7 +146,7 @@ public: static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform); static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0); bool deliverInitialMousePressEvent(QMouseEvent *); - bool deliverMouseEvent(QMouseEvent *); + void deliverMouseEvent(QMouseEvent *); bool sendFilteredMouseEvent(QQuickItem *, QQuickItem *, QEvent *, QSet<QQuickItem *> *); #ifndef QT_NO_WHEELEVENT bool deliverWheelEvent(QQuickItem *, QWheelEvent *); |