diff --git a/QGCInstaller.pri b/QGCInstaller.pri index 57b048fc738d3bfc8a67c69883e7bf91fe57594f..a9ffb6656a4e1ecef425bd97b5b4e492f14867db 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -27,9 +27,9 @@ installer { # 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 += && mkdir -p $${DESTDIR}/package - QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src + QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt QGroundControl.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src QMAKE_POST_LINK += && cd $${OUT_PWD} - QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg + QMAKE_POST_LINK += && hdiutil create -verbose -stretch 1g -layout SPUD -srcfolder $${DESTDIR}/QGroundControl.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg } WindowsBuild { # The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/qgroundcontrol_installer.nsi index 1e2c8d64d9cc63e01831165d2838e715afab74a7..36833d1fe70d0c74abcb9b283eb7af164bd5b8ed 100644 --- a/deploy/qgroundcontrol_installer.nsi +++ b/deploy/qgroundcontrol_installer.nsi @@ -44,7 +44,6 @@ InstallDir $PROGRAMFILES\qgroundcontrol !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "installheader.bmp"; -!insertmacro MUI_PAGE_LICENSE "license.txt" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES