diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-23 17:38:46 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-23 17:38:46 (GMT) |
| commit | 4501731349406110ecde2d260a8ab1e1bcedf179 (patch) | |
| tree | 5ec176e26bbd207741ca40a1704e654c30fb8571 /mkspecs/win32-g++/qmake.conf | |
| parent | 3c982b5d214cc7a37ace1d956ac8fb0b9a281722 (diff) | |
| parent | 0442b383dced6b5cc31e4fc2bf939e3125354f82 (diff) | |
| download | Qt-4501731349406110ecde2d260a8ab1e1bcedf179.zip Qt-4501731349406110ecde2d260a8ab1e1bcedf179.tar.gz Qt-4501731349406110ecde2d260a8ab1e1bcedf179.tar.bz2 | |
Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
Diffstat (limited to 'mkspecs/win32-g++/qmake.conf')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 |
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 |