diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 11:05:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 11:05:38 +0100 |
| commit | 2d0c80018e6da8193a6c5bd5d764da509e16ab46 (patch) | |
| tree | e6ffaf8ec73f6cade2d5fbd17b3ba6d27c790a77 /src/client/qwaylandwindow_p.h | |
| parent | e6805407b62c9c57bac488813f77ee5cca71868e (diff) | |
| parent | 8458e06b25c07ebc8cf6b210fc1ea4cc9aeb42eb (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/client/qwaylanddataoffer.cpp
src/client/qwaylanddisplay.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/qwaylandsurfaceitem.cpp
Change-Id: I2eae0fd43a71fbfd7c907ca715707a26f3c134c5
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index de59e4e20..21d4886cc 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -222,8 +222,6 @@ protected: QPoint mOffset; QIcon mWindowIcon; - QWaylandInputDevice *mMouseDevice; - int mMouseSerial; Qt::WindowState mState; QRegion mMask; |