From b9fadd48b03b06830f58f97ed4eec362f417957a Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sat, 9 Mar 2024 12:23:23 +0100
Subject: [PATCH] fix #803 added missed wayland plugins into gui distro
---
src/Deploy/src/pluginsparser.cpp | 4 ++--
tests/modules/modulesqt6_3.cpp | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Deploy/src/pluginsparser.cpp b/src/Deploy/src/pluginsparser.cpp
index 95e29ab..0af4231 100644
--- a/src/Deploy/src/pluginsparser.cpp
+++ b/src/Deploy/src/pluginsparser.cpp
@@ -57,8 +57,8 @@ static const PluginModuleMapping pluginModuleMappings[] =
{"geometryloaders", DeployCore::QtModule::Qt3DRendererModule},
{"webview", DeployCore::QtModule::QtWebViewModule},
{"xcbglintegrations", DeployCore::QtModule::QtGuiModule},
- {"wayland-decoration-client", DeployCore::QtModule::QtQuickModule},
- {"wayland-graphics-integration-client", DeployCore::QtModule::QtQuickModule},
+ {"wayland-decoration-client", DeployCore::QtModule::QtGuiModule},
+ {"wayland-graphics-integration-client", DeployCore::QtModule::QtGuiModule},
{"wayland-graphics-integration-server", DeployCore::QtModule::QtQuickModule},
{"wayland-shell-integration", DeployCore::QtModule::QtGuiModule},
diff --git a/tests/modules/modulesqt6_3.cpp b/tests/modules/modulesqt6_3.cpp
index ea5bdcd..da4ce76 100644
--- a/tests/modules/modulesqt6_3.cpp
+++ b/tests/modules/modulesqt6_3.cpp
@@ -454,12 +454,6 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
"./" + distDir + "/plugins/tls/libqcertonlybackend.so",
"./" + distDir + "/plugins/tls/libqopensslbackend.so",
"./" + distDir + "/plugins/networkinformation/libqnetworkmanager.so",
- "./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
- "./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
- "./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",
- "./" + distDir + "/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so",
- "./" + distDir + "/plugins/wayland-graphics-integration-client/libshm-emulation-server.so",
- "./" + distDir + "/plugins/wayland-graphics-integration-client/libvulkan-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
@@ -994,6 +988,12 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
"./" + distDir + "/plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "/plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "/plugins/wayland-shell-integration/libxdg-shell.so",
+ "./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libshm-emulation-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libvulkan-server.so",
"./" + distDir + "/plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "/plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "/translations/qtbase_ar.qm",