diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-30 10:33:34 -0400 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-04 11:23:39 +0100 |
| commit | 705ae10b204c5a5c47fe75a6ab324d5ed4cd173e (patch) | |
| tree | 2fb9523463403cbef8379a8761cef9e6b91fa18a | |
| parent | deed419755f3ed8409ba0cf784695ca7a3a6063a (diff) | |
Client: Update to new signature for startSystemMove()
In 35dfb5a5, we temporarily disabled the override to let qt5.git update, now we
add it back with the new signature. This means QWindow::startSystemMove now
works for Wayland.
Task-number: QTBUG-81751
Task-number: QTBUG-73011
Change-Id: I1459300d6f7fb77a9ae07bb4f5c2b80722f9b02c
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 3 | ||||
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 8cc26d71c..7802aca66 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -1185,9 +1185,8 @@ void QWaylandWindow::propagateSizeHints() mShellSurface->propagateSizeHints(); } -bool QtWaylandClient::QWaylandWindow::startSystemMove(const QPoint &pos) +bool QtWaylandClient::QWaylandWindow::startSystemMove() { - Q_UNUSED(pos); if (auto seat = display()->lastInputDevice()) return mShellSurface && mShellSurface->move(seat); return false; diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index c0328996d..8a22bacca 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -196,7 +196,7 @@ public: void propagateSizeHints() override; void addAttachOffset(const QPoint point); - bool startSystemMove(const QPoint &pos); + bool startSystemMove() override; void timerEvent(QTimerEvent *event) override; void requestUpdate() override; |