diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-07-07 22:01:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-07-08 11:26:30 +0000 |
commit | e50b4e539f08b9fc6ffcd9876c550138b4d5f173 (patch) | |
tree | 81654792168e5d83670902a7e8154f8ad9262029 /src/quick/items/qquickwindow_p.h | |
parent | 8185e52960ae96c963b663b94cb0a782e7441ae6 (diff) |
Simplify parameters to QQuickPointerEvent::reset
We don't need the device passed in, but can infer it.
Change-Id: I95479493431f8ca8047bcf124c295081d4895d6c
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
-rw-r--r-- | src/quick/items/qquickwindow_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index f2ec469b21..e06fe4472d 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -156,7 +156,7 @@ public: #ifndef QT_NO_GESTURES bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *); #endif - QQuickPointerDevice *touchDevice(QTouchDevice *d); + static QQuickPointerDevice *touchDevice(QTouchDevice *d); bool deliverTouchPoints(QQuickItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *, QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *, QSet<QQuickItem*> *filtered); void handleTouchEvent(QTouchEvent *); |