diff --git a/QGCSetup.pri b/QGCSetup.pri index f0e151d165bf5922bb54a034ddb20a36ec5e4444..3af4942d5aa4155f6df73ebfceab623c2afc35b8 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -60,6 +60,7 @@ MacBuild { WindowsBuild { BASEDIR_WIN = $$replace(BASEDIR, "/", "\\") DESTDIR_WIN = $$replace(DESTDIR, "/", "\\") + QT_BIN_DIR = $$dirname(QMAKE_QMAKE) # Copy dependencies DebugBuild: DLL_QT_DEBUGCHAR = "d" @@ -72,7 +73,6 @@ WindowsBuild { QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\" } - ReleaseBuild { # Copy Visual Studio DLLs # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed. @@ -94,7 +94,7 @@ WindowsBuild { } DEPLOY_TARGET = $$shell_quote($$shell_path($$DESTDIR_WIN\\$${TARGET}.exe)) - QMAKE_POST_LINK += $$escape_expand(\\n) windeployqt --no-compiler-runtime --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET} + QMAKE_POST_LINK += $$escape_expand(\\n) $$QT_BIN_DIR\\windeployqt --no-compiler-runtime --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET} }