diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:52:32 +0200 |
| commit | e6c944939f88afe852d2d0a604fd9815c409f2eb (patch) | |
| tree | 644736aa8a6235dd1db6e1cef18ee1aec28439da /src/client/qwaylandinputdevice_p.h | |
| parent | dbf418dce41fe08368d38a098a771348a5b3d0fd (diff) | |
| parent | 4934b87156a889584a34e36c22abd9aee64cef7e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/client/qwaylandwindow.cpp
Change-Id: I3ae070ff20df4b858a4eef769438092c061e47ef
Diffstat (limited to 'src/client/qwaylandinputdevice_p.h')
| -rw-r--r-- | src/client/qwaylandinputdevice_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h index 4d0a47597..9e3d1d1f4 100644 --- a/src/client/qwaylandinputdevice_p.h +++ b/src/client/qwaylandinputdevice_p.h @@ -314,11 +314,12 @@ public: , buttons(b) , modifiers(m) {} - inline QWaylandPointerEvent(Type t, ulong ts, const QPointF &l, const QPointF &g, const QPoint &pd, const QPoint &ad) + inline QWaylandPointerEvent(Type t, ulong ts, const QPointF &l, const QPointF &g, const QPoint &pd, const QPoint &ad, Qt::KeyboardModifiers m) : type(t) , timestamp(ts) , local(l) , global(g) + , modifiers(m) , pixelDelta(pd) , angleDelta(ad) {} |