diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-08 13:28:56 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-12 15:48:10 (GMT) |
commit | 742933c308b4ce4008599f484cd94cf283a92007 (patch) | |
tree | 79ea3dc98984bd3ee4d88a194e1adad43dd413d6 /qmake | |
parent | 8e7fe402ab07c016fd0ba7d9fae395e532b4dfc5 (diff) | |
download | Qt-742933c308b4ce4008599f484cd94cf283a92007.zip Qt-742933c308b4ce4008599f484cd94cf283a92007.tar.gz Qt-742933c308b4ce4008599f484cd94cf283a92007.tar.bz2 |
use variables from the spec instead of hard-coding platform ifdefs
Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 26dd3fd..c7d9e7a 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -303,19 +303,16 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool // generate command lines like this ... // -@ if NOT EXIST ".\somedir" mkdir ".\somedir" QStringList dirsToClean; + QString dirExists = var("QMAKE_CHK_DIR_EXISTS"); + QString mkdir = var("QMAKE_MKDIR"); for (QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) { QStringList values = it.value(); for (int i = 0; i < values.size(); ++i) { if (values.at(i).endsWith("/" QT_EXTRA_INCLUDE_DIR)) { QString fixedValue(QDir::toNativeSeparators(values.at(i))); dirsToClean << fixedValue; -#ifdef Q_OS_WIN32 - t << "\t-@ if NOT EXIST \"" << fixedValue << "\" mkdir \"" - << fixedValue << "\"" << endl; -#else - t << "\t-@ if test ! -d \"" << fixedValue << "\"; then mkdir \"" - << fixedValue << "\"" << "; fi" <<endl; -#endif + t << "\t-@ " << dirExists << " \"" << fixedValue << "\" " + << mkdir << " \"" << fixedValue << "\"" << endl; } } } |