diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 12:50:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 12:50:12 (GMT) |
| commit | 642ea61e13794f36f92f694bc807bc3a4ff1138b (patch) | |
| tree | 6b92a4c46b93236bb77aae89c6803d58353b6d18 | |
| parent | d446a0ec464556ede91225b14e75f2f8f5a748d5 (diff) | |
| parent | 20097c27f55d8bc61ba41de5997d25f86daa18ed (diff) | |
| download | Qt-642ea61e13794f36f92f694bc807bc3a4ff1138b.zip Qt-642ea61e13794f36f92f694bc807bc3a4ff1138b.tar.gz Qt-642ea61e13794f36f92f694bc807bc3a4ff1138b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix QMAKE_COPY_DIR for mingw+sh
| -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 |