From e345b35ee4d8afb489cd4b5ee0f74c02d310c1cc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 7 Apr 2013 16:48:47 +0100 Subject: 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 --- mkspecs/android-g++/qmake.conf | 5 +++++ 1 file changed, 5 insertions(+) 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 = / } } -- cgit v1.2.3