Fix QML imports deployment when using path
authorMorten Johan Sørvig <morten.sorvig@theqtcompany.com>
Mon, 10 Aug 2015 13:36:16 +0000 (15:36 +0200)
committerMorten Johan Sørvig <morten.sorvig@theqtcompany.com>
Thu, 13 Aug 2015 09:03:39 +0000 (09:03 +0000)
commit6a86f7026816fa657f070d10f9164d7b7099a71c
tree3d152174d79fe833cdd7ea82e3661dfdb891d7bd
parentc2952ff8df1e18fe0120d8b29901b0b794afccc7
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>
src/macdeployqt/macdeployqt/main.cpp
src/macdeployqt/shared/shared.cpp
src/macdeployqt/shared/shared.h