diff --git a/QGCInstaller.pri b/QGCInstaller.pri index d7a335ef9f972ed3c19f5395eafaa5c907de1d56..740c39891bf0d78380d531b8e4da61ca341503d8 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")