diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-09 13:50:59 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-20 11:10:23 +0200 |
| commit | 622b55e918bfc877c10f8885754b30b593d334a5 (patch) | |
| tree | 67527424d118e43a077838b9188d5e9372a7d902 /src/compositor | |
| parent | d8b8ecf7281ee34ba4f68283ed7f204b0e2ce3f9 (diff) | |
| download | qtwayland-622b55e918bfc877c10f8885754b30b593d334a5.tar.gz | |
Remove usages of deprecated APIs
- Make the code related to deprecated QWaylandWlScaler compile
conditionally, only when QWaylandWlScaler is enabled.
- Replace the usages of deprecated APIs by the corresponding
alternatives.
- Fix the tests to compile when the deprecated APIs are disabled.
Task-number: QTBUG-76491
Task-number: QTBUG-76541
Change-Id: Ieba98858e970868a2cbc97df2d06bae346e30d7a
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandwlscaler_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 0a179c13..01b183b8 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -610,7 +610,7 @@ void QWaylandQuickItem::wheelEvent(QWheelEvent *event) { Q_D(QWaylandQuickItem); if (d->shouldSendInputEvents()) { - if (!inputRegionContains(event->pos())) { + if (!inputRegionContains(event->position())) { event->ignore(); return; } diff --git a/src/compositor/extensions/qwaylandwlscaler_p.h b/src/compositor/extensions/qwaylandwlscaler_p.h index d3c2edd7..10a66f88 100644 --- a/src/compositor/extensions/qwaylandwlscaler_p.h +++ b/src/compositor/extensions/qwaylandwlscaler_p.h @@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 13) class QWaylandSurface; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlScalerPrivate @@ -87,6 +88,7 @@ private: QPointer<QWaylandSurface> m_surface = nullptr; }; }; +#endif QT_END_NAMESPACE |