[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bandroid-qt/experimental=5D_mkspecs/android-g++=3A_W?=
From:       Ray Donnelly <mingw.android () laptop ! com>
Date:       2011-07-10 21:38:53
Message-ID: 20110710213853.4ED8BA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 92931d05de75570068a563d190d30eb1a667b0fa by Ray Donnelly.
Committed on 10/07/2011 at 23:38.
Pushed by rdonnelly into branch 'experimental'.

Windows: Fix Android Qt building on MSYS

Only use Windows cmd.exe commands if isEmpty(QMAKE_SH)

M  +17   -10   mkspecs/android-g++/qmake.conf     

http://commits.kde.org/android-qt/92931d05de75570068a563d190d30eb1a667b0fa

diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index 74e25da..4e6c82e 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -9,17 +9,24 @@ include(../common/qws.conf)
 CONFIG      = qt warn_on release link_prl ashmem android android_qtmain
 QT          = core gui android
 
+# Passing in -win32 to qmake (from NQTC) causes this condition to pass, however
+# qmake complains that -win32 is deprecated; should find another way, Q_OS_WIN
+# should really be all QMAKE_HOST.os needs to depend on?
 contains(QMAKE_HOST.os,Windows) {
-    QMAKE_COPY           = copy /y
-    QMAKE_COPY_DIR       = xcopy /s /q /y /i
-    QMAKE_MOVE           = move
-    QMAKE_DEL_FILE       = del /q 2> NUL
-    QMAKE_MKDIR          = mkdir
-    QMAKE_DEL_DIR        = rmdir
-    QMAKE_DEL_TREE       = rmdir /s /q
-    QMAKE_CHK_DIR_EXISTS = if not exist
-    QMAKE_INSTALL_FILE    = copy /y
-    QMAKE_INSTALL_PROGRAM = copy /y
+    # 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) {
+        QMAKE_COPY           = copy /y
+        QMAKE_COPY_DIR       = xcopy /s /q /y /i
+        QMAKE_MOVE           = move
+        QMAKE_DEL_FILE       = del /q 2> NUL
+        QMAKE_MKDIR          = mkdir
+        QMAKE_DEL_DIR        = rmdir
+        QMAKE_DEL_TREE       = rmdir /s /q
+        QMAKE_CHK_DIR_EXISTS = if not exist
+        QMAKE_INSTALL_FILE    = copy /y
+        QMAKE_INSTALL_PROGRAM = copy /y
+    }
 }
 
 NDK_ROOT = $$(ANDROID_NDK_ROOT)

[prev in list] [next in list] [prev in thread] [next in thread]