From f1d1b8219cbb94ec327047d71ebdc6510317ce3b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 15 May 2013 12:11:31 +0100 Subject: 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 Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/android-g++/qmake.conf | 4 ++++ mkspecs/win32-g++/qmake.conf | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index d1b94bb1aa..5a056b3d00 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -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 } } diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 22277e1e82..9c776e8655 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -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) } -- cgit v1.2.3