summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@theqtcompany.com>2015-06-08 10:17:52 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-08 08:51:19 +0000
commit3f69aa732d22603d88f98728b51b76888f062c94 (patch)
tree6ce840ca769afad8afddae2f3781e8d07a3f5f2d
parent78beb4c7d337356d6f478d84b2e7b1fa227a2c3a (diff)
downloadqttools-3f69aa732d22603d88f98728b51b76888f062c94.tar.gz
macdeployqt: fix plugin deployment.
Set deploymentInfo.deployedFrameworks again, which was accidentally removed by ad31b989. (The plugin deployment logic uses deployedFrameworks to determine which plugins to deploy.) Task-number: QTBUG-46494 Change-Id: I0d6168cc8e646d519578d24dc0a35f0836d3be7b Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r--src/macdeployqt/shared/shared.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index 1c9b319ad..647b09f3a 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -873,6 +873,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
}
}
}
+ deploymentInfo.deployedFrameworks = copiedFrameworks;
deployRPaths(rpathsUsed, binaryPaths, useLoaderPath);
deploymentInfo.rpathsUsed += rpathsUsed;
return deploymentInfo;