MSYS: use cp -f for QMAKE_INSTALL_*
... in mingw-using specs because msysgit doesn't provide install.exe and Windows doesn't care about Unix permissions anyway. Task-number: QTBUG-31147 Change-Id: Ic8032ca1a970ef41381852b6c5c372b805a124f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
parent
048ce11557
commit
f1d1b8219c
@ -27,6 +27,10 @@ contains(QMAKE_HOST.os,Windows) {
|
||||
} else {
|
||||
MINGW_IN_SHELL = 1
|
||||
QMAKE_DIR_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
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -94,6 +94,10 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
|
||||
MINGW_IN_SHELL = 1
|
||||
QMAKE_DIR_SEP = /
|
||||
include(../common/shell-unix.conf)
|
||||
# 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
|
||||
} else {
|
||||
include(../common/shell-win32.conf)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user