QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-26 17:54:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #804 from QuasarApp/task_803
All checks were successful
buildbot/DocsGenerator Build finished.
Details
buildbot/WindowsCMakeBuilder Build finished.
Details
buildbot/AndroidBuilder_v8Qt6 Build finished.
Details
buildbot/LinuxCMakeBuilderQt6 Build finished.
Details

Browse Source 
Added missed Wayland plugins into gui distribution kit
This commit is contained in:
Andrei Yankovich 2024-03-09 12:42:04 +01:00 committed by GitHub
commit ec4840f28b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Deploy/src/pluginsparser.cpp
View File

@ -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},

12
tests/modules/modulesqt6_3.cpp
View File

@ -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",

8
tests/units/linux/confifiletest.cpp
View File

@ -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