TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Deploy platformthemes/libqgtk2.so, styles/libqgtk2style.so, iconengines and imageformats (#352)"

Browse Source 
This reverts commit aa78a03de0.
This commit is contained in:
probonopd
2019-03-09 21:15:55 +01:00
parent 38bd68eebf
commit fb878b1dfc
1 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+28 -35
View File
@@ -1218,6 +1218,25 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
// Plugin white list:
QStringList pluginList;
// Make the bundled application look good on, e.g., Xfce
// Note: http://code.qt.io/qt/qtstyleplugins.git must be compiled (using libgtk2.0-dev)
// https://askubuntu.com/a/910143
// https://askubuntu.com/a/748186
// This functionality used to come as part of Qt by default in earlier versions
// At runtime, export QT_QPA_PLATFORMTHEME=gtk2 (Xfce does this itself)
pluginList.append("platformthemes/libqgtk2.so");
pluginList.append("styles/libqgtk2style.so");
// Always bundle iconengines,imageformats
// https://github.com/probonopd/linuxdeployqt/issues/82
// https://github.com/probonopd/linuxdeployqt/issues/325
// FIXME
// The following does NOT work;
// findDependencyInfo: "ldd: /usr/local/Qt-5.9.3/plugins/iconengines: not regular file"
// pluginList.append("iconengines");
// pluginList.append("imageformats");
// TODO: Need to traverse the directories and add each contained plugin individually
LogDebug() << "deploymentInfo.deployedLibraries before attempting to bundle required plugins:" << deploymentInfo.deployedLibraries;
// Platform plugin:
@@ -1238,42 +1257,16 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
pluginList.append(QStringLiteral("platformthemes/") + plugin);
}
*/
// Make the bundled application look good on, e.g., Xfce
// Note: http://code.qt.io/qt/qtstyleplugins.git must be compiled (using libgtk2.0-dev)
// https://askubuntu.com/a/910143
// https://askubuntu.com/a/748186
// This functionality used to come as part of Qt by default in earlier versions
// At runtime, export QT_QPA_PLATFORMTHEME=gtk2 (Xfce does this itself)
QStringList extraQtPluginsAdded = { "platformthemes/libqgtk2.so", "styles/libqgtk2style.so" };
foreach (const QString &plugin, extraQtPluginsAdded) {
if (QFile::exists(pluginSourcePath + "/" + plugin)) {
pluginList.append(plugin);
LogDebug() << plugin << "appended";
} else {
LogWarning() <<"Plugin" << pluginSourcePath + "/" + plugin << "not found, skipping";
}
}
// Always bundle iconengines,imageformats
// https://github.com/probonopd/linuxdeployqt/issues/82
// https://github.com/probonopd/linuxdeployqt/issues/325
// FIXME
// The following does NOT work;
// findDependencyInfo: "ldd: /usr/local/Qt-5.9.3/plugins/iconengines: not regular file"
// pluginList.append("iconengines");
// pluginList.append("imageformats");
// TODO: Need to traverse the directories and add each contained plugin individually
QStringList extraQtPluginDirs = { "iconengines", "imageformats" };
foreach (const QString &plugin, extraQtPluginDirs) {
QDir pluginDirectory(pluginSourcePath + "/" + plugin);
if (pluginDirectory.exists()) {
//If it is a plugin directory we will deploy the entire directory
QStringList plugins = pluginDirectory.entryList(QStringList() << QStringLiteral("*.so"));
foreach (const QString &pluginFile, plugins) {
pluginList.append(plugin + "/" + pluginFile);
LogDebug() << plugin + "/" + pluginFile << "appended";
// All image formats (svg if QtSvg library is used)
QStringList imagePlugins = QDir(pluginSourcePath + QStringLiteral("/imageformats")).entryList(QStringList() << QStringLiteral("*.so"));
foreach (const QString &plugin, imagePlugins) {
if (plugin.contains(QStringLiteral("qsvg"))) {
if (containsHowOften(deploymentInfo.deployedLibraries, "libQt5Svg")) {
pluginList.append(QStringLiteral("imageformats/") + plugin);
}
}
} else {
pluginList.append(QStringLiteral("imageformats/") + plugin);
}
}
}