diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-08 13:29:39 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-12 15:48:10 (GMT) |
| commit | 5f17496ac4a7179f91b3160e7083808200b91716 (patch) | |
| tree | 5dd31711b2c3688359fce2675980a5e9b291f4d6 | |
| parent | 742933c308b4ce4008599f484cd94cf283a92007 (diff) | |
| download | Qt-5f17496ac4a7179f91b3160e7083808200b91716.zip Qt-5f17496ac4a7179f91b3160e7083808200b91716.tar.gz Qt-5f17496ac4a7179f91b3160e7083808200b91716.tar.bz2 | |
add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs
Reviewed-by: mariusSO
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index f1a6788..aab766d 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -82,6 +82,7 @@ QMAKE_LIBS_S60 = -lavkon QMAKE_DEL_FILE = rm -f QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir + QMAKE_DEL_TREE = rmdir /s /q QMAKE_CHK_DIR_EXISTS = test -d } else { QMAKE_COPY = copy /y @@ -90,6 +91,7 @@ QMAKE_LIBS_S60 = -lavkon QMAKE_DEL_FILE = del 2> NUL QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir + QMAKE_DEL_TREE = rm -rf QMAKE_CHK_DIR_EXISTS = if not exist } diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index c7d9e7a..a3a504f 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -321,11 +321,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool // Note: EXTENSION_CLEAN will get called many times when doing reallyclean // This is why the "2> NUL" gets appended to generated clean targets in makefile.cpp. t << EXTENSION_CLEAN ": " COMPILER_CLEAN_TARGET << endl; -#ifdef Q_OS_WIN32 - generateCleanCommands(t, dirsToClean, var("QMAKE_DEL_DIR"), " /S /Q ", "", ""); -#else - generateCleanCommands(t, dirsToClean, "rm", " -rf ", "", ""); -#endif + generateCleanCommands(t, dirsToClean, var("QMAKE_DEL_TREE"), "", "", ""); t << endl; t << PRE_TARGETDEPS_TARGET ":" |