Merge pull request #438 from QuasarApp/xinerama

libxcb-xinerama.so is added  to the white list
This commit is contained in:
Andrei Yankovich 2020-11-05 15:57:20 +03:00 committed by GitHub
commit a52708e29e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions

View File

@ -593,6 +593,9 @@ QStringList DeployCore::Qt3rdpartyLibs(Platform platform) {
"libicuuc",
// End Unicode libs
// xcb plugin
"libxcb-xinerama",
};
}

View File

@ -138,6 +138,7 @@ QSet<QString> 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<QString> 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<QString> 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<QString> 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",

View File

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