Android: Fixes for building under MSYS.
Need to set MINGW_IN_SHELL to 1 and QMAKE_DIR_SEP to / Change-Id: If470f1a4617555d6bc551e8cdf917779d0e64e62 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
453e4da6d1
commit
e345b35ee4
@ -18,10 +18,15 @@ contains(QMAKE_HOST.os,Windows) {
|
||||
# Not having sh.exe in your path causes this condition to pass
|
||||
# To build Android Qt on Windows, this block must not be evaluated.
|
||||
isEmpty(QMAKE_SH) {
|
||||
# Override values from previously loaded shell-unix.conf
|
||||
# (via unix.conf, via linux.conf).
|
||||
include(../common/shell-win32.conf)
|
||||
QMAKE_DEL_TREE = rmdir /s /q
|
||||
QMAKE_INSTALL_FILE = copy /y
|
||||
QMAKE_INSTALL_PROGRAM = copy /y
|
||||
} else {
|
||||
MINGW_IN_SHELL = 1
|
||||
QMAKE_DIR_SEP = /
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user