From 1587c6a74f4a92c817ddf24a1e00a3c77edd6719 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 18 Feb 2015 12:57:02 -0800
Subject: [PATCH] Deploy qml modules

Also fix problem with incorrect symbolic link to plugins
---
 QGCInstaller.pri | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index d7a335ef9..740c39891 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -19,10 +19,16 @@
 
 installer {
     MacBuild {
-        QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt $${DESTDIR}/qgroundcontrol.app
-        QMAKE_POST_LINK += && hdiutil create -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/qgroundcontrol.dmg
+        # We copy qgroundcontrol.app to the current directory so we can run macdeployqt without a path to the
+        # qgroundcontrol.app file. If you specify a path to the .app file the symbolic links to plugins will not
+        # be created correctly.
+        QMAKE_POST_LINK += && rm -rf qgroundcontrol.app
+        QMAKE_POST_LINK += && cp -r $${DESTDIR}/qgroundcontrol.app .
+        QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=src -dmg
+        QMAKE_POST_LINK += && rm -rf qgroundcontrol.app
+        QMAKE_POST_LINK += && mv qgroundcontrol.dmg release
     }
-    
+
     WindowsBuild {
 		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
 		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.ilk")
-- 
2.22.0