diff options
| author | JiDe Zhang <zhangjide@uniontech.com> | 2021-05-26 10:05:14 +0800 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2021-06-25 15:31:12 +0200 |
| commit | 5e37d73ad9d00180dec179119e07f2387d45f335 (patch) | |
| tree | 6bdbd517f861306ff953f93b6aa9e7b09468ed44 /src/hardwareintegration | |
| parent | f91151bc9648c5b3cd13b5f82816093f5c8d20fb (diff) | |
| download | qtwayland-5e37d73ad9d00180dec179119e07f2387d45f335.tar.gz | |
Use QEventPoint::State instead of Qt::TouchPointState
Also fix compile warnings about -Wenum-compare.
Pick-to: 6.2 6.1 6.0 5.15
Change-Id: I5e94fc028c727b155d5db4c7def35d518c497c5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h | 2 | ||||
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 5fe21d7b..6327ffd4 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -54,6 +54,8 @@ #include <QWaitCondition> #include <X11/Xlib.h> +// conflict with QInputDevice::Capability::None +#undef None #include <EGL/egl.h> // avoid clashes with Qt::CursorShape diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h index 80969081..b86de4e9 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -50,6 +50,8 @@ #include <QtGui/QWindow> #include <X11/Xlib.h> +// conflict with QInputDevice::Capability::None +#undef None // avoid clashes with Qt::CursorShape #ifdef CursorShape |