diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 21:52:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 21:52:55 (GMT) |
| commit | bc202c358ee2d1082a7c290d28d0dfe82b0e6a7e (patch) | |
| tree | f9157ade1b4c59a800f2fd6e7d8df6a8edcaca94 /mkspecs | |
| parent | 305ece9e4486edc94190dccd24e6838e81559a67 (diff) | |
| parent | a7e3ba3ecfa91a308f7c3a2f471b180afa4f4a5f (diff) | |
| download | Qt-bc202c358ee2d1082a7c290d28d0dfe82b0e6a7e.zip Qt-bc202c358ee2d1082a7c290d28d0dfe82b0e6a7e.tar.gz Qt-bc202c358ee2d1082a7c290d28d0dfe82b0e6a7e.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
Diffstat (limited to 'mkspecs')
| -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 |