From b30865ced9cf43cf8974473274d76f65e0a43732 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 11 Apr 2022 01:34:07 +0400 Subject: [PATCH] Restore original xdg-shell linking --- external/qt/CMakeLists.txt | 1 + external/qt/qt6/CMakeLists.txt | 1 + external/qt/qt_static_plugins/qt_static_plugins.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 3bddf48..439738c 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -224,6 +224,7 @@ else() plugins/platforms/${qt_lib_prefix}qwayland-generic plugins/platforms/${qt_lib_prefix}qwayland-egl plugins/wayland-graphics-integration-client/${qt_lib_prefix}qt-plugin-wayland-egl + plugins/wayland-shell-integration/${qt_lib_prefix}xdg-shell plugins/wayland-decoration-client/${qt_lib_prefix}bradient ) endif() diff --git a/external/qt/qt6/CMakeLists.txt b/external/qt/qt6/CMakeLists.txt index bc36e14..9f84ffb 100644 --- a/external/qt/qt6/CMakeLists.txt +++ b/external/qt/qt6/CMakeLists.txt @@ -201,6 +201,7 @@ else() plugins/platforms/${qt_lib_prefix}qwayland-generic plugins/platforms/${qt_lib_prefix}qwayland-egl plugins/wayland-graphics-integration-client/${qt_lib_prefix}qt-plugin-wayland-egl + plugins/wayland-shell-integration/${qt_lib_prefix}xdg-shell plugins/wayland-decoration-client/${qt_lib_prefix}bradient ) endif() diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp index b420a52..7768185 100644 --- a/external/qt/qt_static_plugins/qt_static_plugins.cpp +++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp @@ -46,6 +46,7 @@ Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin) Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin) Q_IMPORT_PLUGIN(QWaylandEglPlatformIntegrationPlugin) Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin) +Q_IMPORT_PLUGIN(QWaylandXdgShellIntegrationPlugin) Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin) #endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION Q_IMPORT_PLUGIN(QGtk3ThemePlugin)