diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-25 15:04:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-26 10:46:20 +0200 |
| commit | bad18e2db95a399e350b890a0cd084d53c1e2ae8 (patch) | |
| tree | 9af16cdafdb00252df807cf4db8572318cd4d5aa /src/compositor/extensions/qwlqttouch.cpp | |
| parent | 04ed6ad3fc9816947dfe1b3924ca2f109372408c (diff) | |
| download | qtwayland-bad18e2db95a399e350b890a0cd084d53c1e2ae8.tar.gz | |
Adapt to new QPointingDevice API
QTouchDevice has been replaced with a more general QPointingDevice.
All input devices need detailed information and need to be registered
via QWindowSystemInterface::registerInputDevice(). This patch is not
doing that yet; it's just enough to get qtwayland to compile again.
Done-With: Liang Qi <liang.qi@qt.io>
Change-Id: Id3a2e475ed07294a1977004fc72b11e466acc216
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/compositor/extensions/qwlqttouch.cpp')
| -rw-r--r-- | src/compositor/extensions/qwlqttouch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp index f9d1a368..ca92cc2c 100644 --- a/src/compositor/extensions/qwlqttouch.cpp +++ b/src/compositor/extensions/qwlqttouch.cpp @@ -29,8 +29,8 @@ #include "qwlqttouch_p.h" #include "qwaylandview.h" +#include <QPointingDevice> #include <QTouchEvent> -#include <QTouchDevice> #include <QWindow> QT_BEGIN_NAMESPACE @@ -89,7 +89,7 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *s uint32_t id = tp.id(); uint32_t state = (tp.state() & 0xFFFF) | (sentPointCount << 16); - uint32_t flags = (tp.flags() & 0xFFFF) | (int(event->device()->capabilities()) << 16); + uint32_t flags = (tp.flags() & 0xFFFF) | (int(event->pointingDevice()->capabilities()) << 16); int x = toFixed(tp.pos().x()); int y = toFixed(tp.pos().y()); |