encounter/linuxdeploy-plugin-qt
0
0
Fork 0
mirror of https://github.com/encounter/linuxdeploy-plugin-qt.git synced 2026-03-30 11:19:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add experimental wayland integration support

Browse Source
This commit is contained in:
TheAssassin
2019-02-06 23:29:48 +01:00
parent feb31f123a
commit 661d8320ef
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+20 -2
View File
@@ -49,8 +49,10 @@ bool strEndsWith(const std::string &str, const std::string &suffix) {
bool deployPlatformPlugins(appdir::AppDir &appDir, const bf::path &qtPluginsPath) {
ldLog() << "Deploying platform plugins" << std::endl;
if (!appDir.deployLibrary(qtPluginsPath / "platforms/libqxcb.so", appDir.path() / "usr/plugins/platforms/"))
return false;
for (const std::string& libName : {"libqxcb", "libqwayland-egl", "libqwayland-generic"}) {
if (!appDir.deployLibrary(qtPluginsPath / "platforms" / (libName + ".so"), appDir.path() / "usr/plugins/platforms/"))
return false;
}
for (bf::directory_iterator i(qtPluginsPath / "platforminputcontexts"); i != bf::directory_iterator(); ++i) {
if (!appDir.deployLibrary(*i, appDir.path() / "usr/plugins/platforminputcontexts/"))
@@ -97,6 +99,19 @@ bool deployXcbglIntegrationPlugins(appdir::AppDir& appDir, const bf::path& qtPlu
return deployIntegrationPlugins(appDir, qtPluginsPath, {"xcbglintegrations"});
}
bool deployWaylandIntegrationPlugins(appdir::AppDir& appDir, const bf::path& qtPluginsPath) {
ldLog() << "Deploying wayland integrations" << std::endl;
const std::initializer_list<bf::path> pluginDirs = {
"wayland-graphics-integration-client",
"wayland-graphics-integration-server",
"wayland-decoration-client",
"wayland-shell-integration",
};
return deployIntegrationPlugins(appDir, qtPluginsPath, pluginDirs);
}
bool deploySvgPlugins(appdir::AppDir &appDir, const bf::path &qtPluginsPath) {
ldLog() << "Deploying svg icon engine" << std::endl;
@@ -487,6 +502,9 @@ int main(const int argc, const char *const *const argv) {
if (module.name == "opengl" || module.name == "gui" || module.name == "xcbqpa") {
if (!deployXcbglIntegrationPlugins(appDir, qtPluginsPath))
return 1;
if (!deployWaylandIntegrationPlugins(appDir, qtPluginsPath))
ldLog() << LD_WARNING << "Failed to deploy wayland integration plugins; this will become an error in the future" << std::endl;
}
if (module.name == "network") {