Merge pull request #804 from QuasarApp/task_803

Added missed Wayland plugins into gui distribution kit
QuasarApp · Mar 9, 2024 · ec4840f · ec4840f
2 parents dcb26b0 + 7fde7b3
commit ec4840f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git 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
@@ -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",

diff --git a/tests/units/linux/confifiletest.cpp b/tests/units/linux/confifiletest.cpp
@@ -169,13 +169,7 @@ void ConfFileTest::test() {
 #ifdef Q_OS_UNIX
     comapareTree -= utils.createTree(
                 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
-                    "./" + DISTRO_DIR + "/lib/libQt6EglFSDeviceIntegration.so",
-                    "./" + DISTRO_DIR + "/lib/libQt6WaylandEglClientHwIntegration.so",
-#else
-                    "./" + DISTRO_DIR + "/lib/libQt5EglFSDeviceIntegration.so",
-#endif
-
+                    "./" + DISTRO_DIR + "/lib/libQt6EglFSDeviceIntegration.so"
                 });
     auto bin =  TestBinDir + "QtWidgetsProject";
 #else