From b9fadd48b03b06830f58f97ed4eec362f417957a Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 9 Mar 2024 12:23:23 +0100 Subject: [PATCH 1/2] 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 95e29abf..0af42318 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 ea5bdcd8..da4ce76a 100644 --- a/tests/modules/modulesqt6_3.cpp +++ b/tests/modules/modulesqt6_3.cpp @@ -454,12 +454,6 @@ QSet 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 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", From 7fde7b3406bfcd850fd27b4a6d05f5447b9d5595 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 9 Mar 2024 12:32:37 +0100 Subject: [PATCH 2/2] fix tests --- tests/units/linux/confifiletest.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/units/linux/confifiletest.cpp b/tests/units/linux/confifiletest.cpp index 85b4a1f8..8a662646 100644 --- 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