diff options
Diffstat (limited to 'mkspecs/android-g++/qmake.conf')
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index e334686b49..2fb2f4cc20 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -10,30 +10,6 @@ include(../common/gcc-base-unix.conf) load(device_config) -# 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) { - # 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 = / - QMAKE_DIRLIST_SEP = : - # Because install's ability to set permissions is not relevant on Windows, - # and git's msys does not provide it to start with. - QMAKE_INSTALL_FILE = cp -f - QMAKE_INSTALL_PROGRAM = cp -f - } -} - NDK_ROOT = $$(ANDROID_NDK_ROOT) !exists($$NDK_ROOT) { NDK_ROOT = $$DEFAULT_ANDROID_NDK_ROOT |