summaryrefslogtreecommitdiffstats
path: root/src/macdeployqt
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2017-11-07 00:20:58 +0100
committerJake Petroules <jake.petroules@qt.io>2017-11-07 17:19:58 +0000
commitbdf6e44049acbede3224b83e17718b34c800af5d (patch)
tree97407d99308580baf2702ff2f68c1ae95c0aff18 /src/macdeployqt
parent4e612c7d3dbfebfaf3eac346aa5261760871a799 (diff)
macdeployqt: Add missing Qt3D plugins deployment
When deploying a Qt3D application, only the frameworks were deployed. This patch fixes this by also deploying the corresponding plugins. [ChangeLog][macOS][deployment] Qt3D plugins are now deployed along the frameworks. Change-Id: I53f2f94ced10629d80d6a3d9af38a3f9517ae6bc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/macdeployqt')
-rw-r--r--src/macdeployqt/shared/shared.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index f30cb79a8..7f566f1ee 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -1085,6 +1085,17 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
addPlugins(QStringLiteral("audio"));
}
+ // render related plugins if Qt3DRender.framework is in use
+ if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("Qt3DRender") + libInfixWithFramework)) {
+ addPlugins(QStringLiteral("sceneparsers"));
+ addPlugins(QStringLiteral("geometryloaders"));
+ }
+
+ // scene related plugins if Qt3DQuickRender.framework is in use
+ if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("Qt3DQuickRender") + libInfixWithFramework)) {
+ addPlugins(QStringLiteral("renderplugins"));
+ }
+
foreach (const QString &plugin, pluginList) {
QString sourcePath = pluginSourcePath + "/" + plugin;
if (useDebugLibs) {