From e4f9aca772e7d3997e23733a28c3df6e7db3b796 Mon Sep 17 00:00:00 2001 From: EndrII Date: Thu, 5 Nov 2020 14:51:37 +0300 Subject: [PATCH] libxcb-xinerama.so is added to the white list --- Deploy/deploycore.cpp | 3 +++ UnitTests/modulesqt513.cpp | 4 ++++ UnitTests/tst_deploytest.cpp | 1 + 3 files changed, 8 insertions(+) diff --git a/Deploy/deploycore.cpp b/Deploy/deploycore.cpp index b021e72..fc1fcaf 100644 --- a/Deploy/deploycore.cpp +++ b/Deploy/deploycore.cpp @@ -593,6 +593,9 @@ QStringList DeployCore::Qt3rdpartyLibs(Platform platform) { "libicuuc", // End Unicode libs + + // xcb plugin + "libxcb-xinerama", }; } diff --git a/UnitTests/modulesqt513.cpp b/UnitTests/modulesqt513.cpp index f546696..f2b8448 100644 --- a/UnitTests/modulesqt513.cpp +++ b/UnitTests/modulesqt513.cpp @@ -138,6 +138,7 @@ QSet ModulesQt513::qtLibs(const QString &distDir) const { "./" + distDir + "/lib/libicudata.so", "./" + distDir + "/lib/libicui18n.so", "./" + distDir + "/lib/libicuuc.so", + "./" + distDir + "/lib/libxcb-xinerama.so.0", "./" + distDir + "/plugins/iconengines/libqsvgicon.so", "./" + distDir + "/plugins/imageformats/libqgif.so", "./" + distDir + "/plugins/imageformats/libqicns.so", @@ -1873,6 +1874,7 @@ QSet ModulesQt513::testDistroLibs(const QString &distDir) const { "./" + distDir + "/lolLib/libicudata.so", "./" + distDir + "/lolLib/libicui18n.so", "./" + distDir + "/lolLib/libicuuc.so", + "./" + distDir + "/lolLib/libxcb-xinerama.so.0", "./" + distDir + "/lolTr/qtbase_ar.qm", "./" + distDir + "/lolTr/qtbase_bg.qm", "./" + distDir + "/lolTr/qtbase_ca.qm", @@ -1952,6 +1954,7 @@ QSet ModulesQt513::testDistroLibs(const QString &distDir) const { "./" + distDir + "/package2/ZzZ/lib/libicudata.so", "./" + distDir + "/package2/ZzZ/lib/libicui18n.so", "./" + distDir + "/package2/ZzZ/lib/libicuuc.so", + "./" + distDir + "/package2/ZzZ/lib/libxcb-xinerama.so.0", "./" + distDir + "/package2/ZzZ/plugins/bearer/libqconnmanbearer.so", "./" + distDir + "/package2/ZzZ/plugins/bearer/libqgenericbearer.so", "./" + distDir + "/package2/ZzZ/plugins/bearer/libqnmbearer.so", @@ -3079,6 +3082,7 @@ QSet ModulesQt513::testOutLibs(const QString &distDir) const { "./" + distDir + "/lolLib/libQt5XcbQpa.so", "./" + distDir + "/lolLib/libicudata.so", "./" + distDir + "/lolLib/libicui18n.so", + "./" + distDir + "/lolLib/libxcb-xinerama.so.0", "./" + distDir + "/lolLib/libicuuc.so", "./" + distDir + "/lolTr/qtbase_ar.qm", "./" + distDir + "/lolTr/qtbase_bg.qm", diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 902eef3..8d7a93b 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -1830,6 +1830,7 @@ void deploytest::testExtraPlugins() { comapareTree -= utils.createTree( { "./" + DISTRO_DIR + "/plugins/platforms/libqxcb.so", + "./" + DISTRO_DIR + "/lib/libxcb-xinerama.so.0", "./" + DISTRO_DIR + "/plugins/xcbglintegrations/libqxcb-egl-integration.so", "./" + DISTRO_DIR + "/plugins/xcbglintegrations/libqxcb-glx-integration.so", "./" + DISTRO_DIR + "/lib/libQt5XcbQpa.so",