macdeployqt: fix plugin deployment.
authorMorten Johan Sørvig <morten.sorvig@theqtcompany.com>
Mon, 8 Jun 2015 08:17:52 +0000 (10:17 +0200)
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>
Mon, 8 Jun 2015 08:51:19 +0000 (08:51 +0000)
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>
src/macdeployqt/shared/shared.cpp

index 1c9b319..647b09f 100644 (file)
@@ -873,6 +873,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
             }
         }
     }
+    deploymentInfo.deployedFrameworks = copiedFrameworks;
     deployRPaths(rpathsUsed, binaryPaths, useLoaderPath);
     deploymentInfo.rpathsUsed += rpathsUsed;
     return deploymentInfo;