summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-02-10 12:34:20 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-02-10 12:35:51 (GMT)
commit20097c27f55d8bc61ba41de5997d25f86daa18ed (patch)
treefd8f99a8035c82924b697d95e72e21b6cd6810b3
parent67405c1b4d8ae5b47191ff1c28606453bf52295c (diff)
downloadQt-20097c27f55d8bc61ba41de5997d25f86daa18ed.zip
Qt-20097c27f55d8bc61ba41de5997d25f86daa18ed.tar.gz
Qt-20097c27f55d8bc61ba41de5997d25f86daa18ed.tar.bz2
fix QMAKE_COPY_DIR for mingw+sh
Task-number: QTBUG-17315
-rw-r--r--mkspecs/win32-g++/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 2d9833b..65ae590 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -77,7 +77,7 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
QMAKE_DIR_SEP = /
QMAKE_QMAKE ~= s,\\\\,/,
QMAKE_COPY = cp
- QMAKE_COPY_DIR = xcopy /s /q /y /i
+ QMAKE_COPY_DIR = cp -r
QMAKE_MOVE = mv
QMAKE_DEL_FILE = rm
QMAKE_MKDIR = mkdir