diff options
Diffstat (limited to 'src/window-lib/waylandcompositor.h')
| -rw-r--r-- | src/window-lib/waylandcompositor.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/window-lib/waylandcompositor.h b/src/window-lib/waylandcompositor.h index 283db83a..5d554d16 100644 --- a/src/window-lib/waylandcompositor.h +++ b/src/window-lib/waylandcompositor.h @@ -5,7 +5,7 @@ ** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage @@ -59,23 +59,11 @@ QT_FORWARD_DECLARE_CLASS(QWaylandWlShell) QT_FORWARD_DECLARE_CLASS(QWaylandWlShellSurface) QT_FORWARD_DECLARE_CLASS(QWaylandTextInputManager) -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - QT_FORWARD_DECLARE_CLASS(QWaylandXdgShell) QT_FORWARD_DECLARE_CLASS(QWaylandXdgSurface) QT_FORWARD_DECLARE_CLASS(QWaylandXdgToplevel) QT_FORWARD_DECLARE_CLASS(QWaylandXdgPopup) -typedef QWaylandXdgShell WaylandXdgShell; -typedef QWaylandXdgSurface WaylandXdgSurface; - -#else -QT_FORWARD_DECLARE_CLASS(QWaylandXdgShellV5) -QT_FORWARD_DECLARE_CLASS(QWaylandXdgSurfaceV5) -typedef QWaylandXdgShellV5 WaylandXdgShell; -typedef QWaylandXdgSurfaceV5 WaylandXdgSurface; - -#endif QT_BEGIN_NAMESPACE_AM @@ -86,12 +74,9 @@ class WindowSurfaceQuickItem; // A WindowSurface object exists for every Wayland surface created in the Wayland server. // Not every WindowSurface maybe an application's Window though - those that are, are available // through the WindowManager model. - -// On Qt 5.11: we support wl-shell and xdg-shell-v5 shell integration extensions. There's no xdg-shell yet -// in qtwayland // -// On Qt 5.12: we support wl-shell and xdg-shell shell integration extensions. Both wl-shell and xdg-shell-v5 -// are deprecated and additionally xdg-shell-v5 is partially broken in qtwayland. +// we support wl-shell and xdg-shell shell integration extensions. Both wl-shell and xdg-shell-v5 +// are deprecated and additionally xdg-shell-v5 is partially broken in qtwayland. // // In any case, wl-shell doesn't provide all the features needed by appman, so clients using it will never work // perfectly. @@ -128,11 +113,9 @@ private: WaylandCompositor *m_compositor; QWaylandWlShellSurface *m_wlSurface = nullptr; - WaylandXdgSurface *m_xdgSurface = nullptr; -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) + QWaylandXdgSurface *m_xdgSurface = nullptr; QWaylandXdgToplevel *m_topLevel = nullptr; QWaylandXdgPopup *m_popup = nullptr; -#endif friend class WaylandCompositor; }; @@ -154,15 +137,13 @@ signals: protected: void doCreateSurface(QWaylandClient *client, uint id, int version); void createWlSurface(QWaylandSurface *surface, const QWaylandResource &resource); - void onXdgSurfaceCreated(WaylandXdgSurface *xdgSurface); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) + void onXdgSurfaceCreated(QWaylandXdgSurface *xdgSurface); void onTopLevelCreated(QWaylandXdgToplevel *toplevel, QWaylandXdgSurface *xdgSurface); void onPopupCreated(QWaylandXdgPopup *popup, QWaylandXdgSurface *xdgSurface); -#endif void onXdgPongReceived(uint serial); QWaylandWlShell *m_wlShell; - WaylandXdgShell *m_xdgShell; + QWaylandXdgShell *m_xdgShell; QVector<QWaylandOutput *> m_outputs; WaylandQtAMServerExtension *m_amExtension; QWaylandTextInputManager *m_textInputManager; |