diff options
| author | Martin Storsjo <martin@martin.st> | 2010-10-18 08:44:28 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-18 08:44:28 (GMT) |
| commit | 3fcb43ac278ba50278f3141f1b7924b514723bf7 (patch) | |
| tree | 64882ccc42e08b1d03b1a4765d744fb37c3ab9ba /qmake | |
| parent | 01e375731c839c9f2bd6ec94e1f2157340925efe (diff) | |
| download | Qt-3fcb43ac278ba50278f3141f1b7924b514723bf7.zip Qt-3fcb43ac278ba50278f3141f1b7924b514723bf7.tar.gz Qt-3fcb43ac278ba50278f3141f1b7924b514723bf7.tar.bz2 | |
qmake/symbian: Don't give the -u flag to cp on Mac OS X, it isn't a standard flag
Also include -R in the linux version of the command, so that it is able to
copy files recursively, which xcopy on windows is able to, if that is
relied on somewhere.
Merge-request: 861
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 127d5c0..4f645af 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -205,8 +205,11 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool #ifdef Q_OS_WIN32 t << "XCOPY = xcopy /d /f /h /r /y /i" << endl; t << "ABLD = ABLD.BAT" << endl; +#elif defined(Q_OS_MAC) + t << "XCOPY = cp -R -v" << endl; + t << "ABLD = abld" << endl; #else - t << "XCOPY = cp -u -v" << endl; + t << "XCOPY = cp -R -u -v" << endl; t << "ABLD = abld" << endl; #endif t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; |