summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2010-09-28 17:23:25 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-28 17:23:25 (GMT)
commit67f340ed4db4ee0b6fe8ab48e2ef2b12973d18da (patch)
tree2635ece824802b235158dd32383664a326682002 /qmake
parente9eb7847a869750af4c0b83e668b7e2e1cf49bea (diff)
downloadQt-67f340ed4db4ee0b6fe8ab48e2ef2b12973d18da.zip
Qt-67f340ed4db4ee0b6fe8ab48e2ef2b12973d18da.tar.gz
Qt-67f340ed4db4ee0b6fe8ab48e2ef2b12973d18da.tar.bz2
Improve Qt/Symbian compatibility with unix shells
Remove an "echo." call that doesn't work on unix, and make the create_temps target work with unix shell syntax (QMAKE_CHK_DIR_EXISTS requires an || before the command to execute on unix shells). Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symmake_abld.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 85dcab4..7416cbe 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -323,6 +323,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
QString fixedValue(QDir::toNativeSeparators(values.at(i)));
dirsToClean << fixedValue;
t << "\t-@ " << dirExists << " \"" << fixedValue << "\" "
+ << (isWindowsShell() ? "" : "|| ")
<< mkdir << " \"" << fixedValue << "\"" << endl;
}
}