1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make QMAKE_DIRLIST_SEP consistent with QMAKE_DIR_SEP

Browse Source 
that is, make it match the shell used by the make command.

this is unlike DIRLIST_SEPARATOR and DIR_SEPARATOR, which always match
the actual system shell.

Change-Id: I0fb277d75b32be029808623a3b77e1358c4e265e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-29 20:25:43 +02:00 committed by The Qt Project
parent e5024c219f
commit f73b9e4af8
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/android-g++/qmake.conf
View File

@ -26,6 +26,7 @@ contains(QMAKE_HOST.os,Windows) {
} else { } else {
MINGW_IN_SHELL = 1 MINGW_IN_SHELL = 1
QMAKE_DIR_SEP = / QMAKE_DIR_SEP = /
QMAKE_DIRLIST_SEP = :
# Because install's ability to set permissions is not relevant on Windows, # Because install's ability to set permissions is not relevant on Windows,
# and git's msys does not provide it to start with. # and git's msys does not provide it to start with.
QMAKE_INSTALL_FILE = cp -f QMAKE_INSTALL_FILE = cp -f

1
mkspecs/common/qcc-base-qnx.conf
View File

@ -57,4 +57,5 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
equals(QMAKE_HOST.os, Windows) { equals(QMAKE_HOST.os, Windows) {
isEmpty(QMAKE_SH): error("This mkspec requires an MSYS environment.") isEmpty(QMAKE_SH): error("This mkspec requires an MSYS environment.")
QMAKE_DIR_SEP = / QMAKE_DIR_SEP = /
QMAKE_DIRLIST_SEP = :
} }

1
mkspecs/win32-g++/qmake.conf
View File

@ -93,6 +93,7 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
!isEmpty(QMAKE_SH) { !isEmpty(QMAKE_SH) {
MINGW_IN_SHELL = 1 MINGW_IN_SHELL = 1
QMAKE_DIR_SEP = / QMAKE_DIR_SEP = /
QMAKE_DIRLIST_SEP = :
include(../common/shell-unix.conf) include(../common/shell-unix.conf)
# Because install's ability to set permissions is not relevant on Windows, # Because install's ability to set permissions is not relevant on Windows,
# and git's msys does not provide it to start with. # and git's msys does not provide it to start with.