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 = /
     }
 }