diff options
author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-08-10 15:36:16 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-08-13 09:03:39 +0000 |
commit | 6a86f7026816fa657f070d10f9164d7b7099a71c (patch) | |
tree | 3d152174d79fe833cdd7ea82e3661dfdb891d7bd /src/macdeployqt/macdeployqt/main.cpp | |
parent | c2952ff8df1e18fe0120d8b29901b0b794afccc7 (diff) |
Fix QML imports deployment when using path
During deployment the value of LC_RPATH on the main
executable gets updated with a new value pointing
inside the app bundle. This happens before QML
import deployment, which means reading LC_RPATH
at QML import deployment time will not give the
correct value.
Use the cached value stored in the DeploymentInfo
structure instead, which will point back to the Qt
installation.
Task-number: QTBUG-47390
Change-Id: Ide84240de408d2338c9f7a68a73849263ce69dff
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Diffstat (limited to 'src/macdeployqt/macdeployqt/main.cpp')
-rw-r--r-- | src/macdeployqt/macdeployqt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp index 40fc438a4..750316f8d 100644 --- a/src/macdeployqt/macdeployqt/main.cpp +++ b/src/macdeployqt/macdeployqt/main.cpp @@ -158,7 +158,7 @@ int main(int argc, char **argv) } if (!qmlDirs.isEmpty()) - deployQmlImports(appBundlePath, qmlDirs); + deployQmlImports(appBundlePath, deploymentInfo, qmlDirs); if (runCodesign) codesign(codesignIdentiy, appBundlePath); |