diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-07-11 13:59:06 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@digia.com> | 2014-08-29 11:31:25 +0200 |
| commit | fb051999b21032b3d55cfd4b99d5514d784bcbcd (patch) | |
| tree | 300037ee8ad048047c6e1906febcc9c76cddd820 /packaging-tools/helpers | |
| parent | b858897e92fb063078bf0299813b22a1aaf5a2cb (diff) | |
Workaround for QNX make install bug
make install fails with QNX on Windows without backslash as the first
separator and forward slashes as other separators in INSTALL_ROOT path.
Use the --installcommand given to the script, instead of default make
command.
Task-number: QTBUG-38555
Change-Id: I2259077daa698b71bc42ffb049514c969931a77c
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'packaging-tools/helpers')
| -rw-r--r-- | packaging-tools/helpers/set_qt5_app_build_env_win.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/helpers/set_qt5_app_build_env_win.bat b/packaging-tools/helpers/set_qt5_app_build_env_win.bat index 7a0607dd3..b8f3ba768 100644 --- a/packaging-tools/helpers/set_qt5_app_build_env_win.bat +++ b/packaging-tools/helpers/set_qt5_app_build_env_win.bat @@ -269,7 +269,7 @@ if %errorlevel%==0 ( echo %cfg%|findstr /i QNX >nul: if %errorlevel%==0 ( set QT5_APPLICATION_BUILD_CMD="mingw32-make -j1" - set QT5_APPLICATION_INSTALL_CMD="mingw32-make -j1" + set QT5_APPLICATION_INSTALL_CMD="make -j1" ) echo "Qt5 essentials lib: %QT5_ESSENTIALS_LIB_PACKAGE_URI%" |