From a4217a1ad0c65e2be478b3510e6e1d2dfaa2c94e Mon Sep 17 00:00:00 2001 From: probonopd Date: Fri, 7 Oct 2016 21:42:40 +0200 Subject: [PATCH] Attempt to close #30 by deploying the xcbglintegrations plugins together with libQt5OpenGL --- shared/shared.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index 239c0a2..8c72493 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -749,7 +749,6 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath LogDebug() << "deploymentInfo.deployedLibraries before attempting to bundle required plugins:" << deploymentInfo.deployedLibraries; // Platform plugin: - if (containsHowOften(deploymentInfo.deployedLibraries, "libQt5Gui")) { LogDebug() << "libQt5Gui detected"; pluginList.append("platforms/libqxcb.so"); @@ -765,6 +764,14 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath } } + // Platform OpenGL context + if (containsHowOften(deploymentInfo.deployedLibraries, "libQt5OpenGL")) { + QStringList xcbglintegrationPlugins = QDir(pluginSourcePath + QStringLiteral("/xcbglintegrations")).entryList(QStringList() << QStringLiteral("*.so")); + foreach (const QString &plugin, xcbglintegrationPlugins) { + pluginList.append(QStringLiteral("xcbglintegrations/") + plugin); + } + } + // CUPS print support if (containsHowOften(deploymentInfo.deployedLibraries, "libQt5PrintSupport")) { pluginList.append("printsupport/libcupsprintersupport.so");