diff options
| author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-07-10 10:58:21 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-08-06 12:24:02 +0000 |
| commit | 6d77b758cf4d2db7722eeb46af573921428771f2 (patch) | |
| tree | a6ff55ce06ea3c0c7077c130d23f8ee84a4039f8 | |
| parent | e57908347009dd1199bd167eeb518f7a5d2ff6d6 (diff) | |
Compile after QPA API changes.
QMouseEvent -> QPoint in QSimpleDrag::move and drop
Task-number: QTBUG-46615
Change-Id: I9cda0f039ee8f5a70219b320abbb65f8649747e1
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| -rw-r--r-- | src/client/qwaylanddnd.cpp | 8 | ||||
| -rw-r--r-- | src/client/qwaylanddnd_p.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/client/qwaylanddnd.cpp b/src/client/qwaylanddnd.cpp index 302864d4b..59f91411f 100644 --- a/src/client/qwaylanddnd.cpp +++ b/src/client/qwaylanddnd.cpp @@ -89,15 +89,15 @@ void QWaylandDrag::cancel() m_display->currentInputDevice()->dataDevice()->cancelDrag(); } -void QWaylandDrag::move(const QMouseEvent *me) +void QWaylandDrag::move(const QPoint &globalPos) { - Q_UNUSED(me); + Q_UNUSED(globalPos); // Do nothing } -void QWaylandDrag::drop(const QMouseEvent *me) +void QWaylandDrag::drop(const QPoint &globalPos) { - Q_UNUSED(me); + Q_UNUSED(globalPos); // Do nothing } diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h index 994c65c45..19b1f92ed 100644 --- a/src/client/qwaylanddnd_p.h +++ b/src/client/qwaylanddnd_p.h @@ -63,8 +63,8 @@ public: protected: void startDrag() Q_DECL_OVERRIDE; void cancel() Q_DECL_OVERRIDE; - void move(const QMouseEvent *me) Q_DECL_OVERRIDE; - void drop(const QMouseEvent *me) Q_DECL_OVERRIDE; + void move(const QPoint &globalPos) Q_DECL_OVERRIDE; + void drop(const QPoint &globalpos) Q_DECL_OVERRIDE; void endDrag() Q_DECL_OVERRIDE; |