summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-11 16:03:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-11 16:03:44 (GMT)
commita7e3ba3ecfa91a308f7c3a2f471b180afa4f4a5f (patch)
tree0784282b5723ef3b0d0a4298b99650b63b1a2956 /mkspecs
parentd1bfdd4f7d4769786c4b9e385e77468d89a31d16 (diff)
parent3f87ae5799fe9c2e20fbde74d785e8597f5cbffa (diff)
downloadQt-a7e3ba3ecfa91a308f7c3a2f471b180afa4f4a5f.zip
Qt-a7e3ba3ecfa91a308f7c3a2f471b180afa4f4a5f.tar.gz
Qt-a7e3ba3ecfa91a308f7c3a2f471b180afa4f4a5f.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'mkspecs')
-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