diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2013-04-07 16:48:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-17 20:10:27 +0200 |
| commit | e345b35ee4d8afb489cd4b5ee0f74c02d310c1cc (patch) | |
| tree | e5128b9d8db9f4d65975d5f3d7a9fdb0190779db | |
| parent | 453e4da6d1c2b5e8212ef9c5f0c68471e9c81d08 (diff) | |
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>
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index c780e2f0d5..7e78725858 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -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 = / } } |