diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-25 09:03:40 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-26 09:54:33 +0000 |
commit | 5f09ab8b94ab83e04493940cbd6c95e6d363d0db (patch) | |
tree | ace107ece2a134780575d03be4e37ae6646dab40 /src/imports/calendar/qquickmonthgrid_p.h | |
parent | c11ef4ffa905ac9ba5e5af89ed03b1786b5187a8 (diff) |
QQuickMonthGrid: fix touch support
QQuickMonthGrid lost its clicked() signal when multi-touch support was
added to QQuickControl, because QQuickControl now accepts touch events
and therefore QQuickMonthGrid no longer gets synthesized mouse events.
Re-implement QQuickControlPrivate::handlePress/Move/Release/Ungrab()
instead of QQuickControl::mouseXxxEvent() to gain multi-touch support.
Task-number: QTBUG-61585
Change-Id: Ic6fb2ea0b43b2b44beb0d8fdd3335a20f7c028f6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/calendar/qquickmonthgrid_p.h')
-rw-r--r-- | src/imports/calendar/qquickmonthgrid_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index 20c9c0fd..b85e0921 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -101,10 +101,6 @@ protected: void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; void updatePolish() override; - void mousePressEvent(QMouseEvent *event) override; - void mouseMoveEvent(QMouseEvent *event) override; - void mouseReleaseEvent(QMouseEvent *event) override; - void mouseUngrabEvent() override; void timerEvent(QTimerEvent *event) override; private: |