From 67f340ed4db4ee0b6fe8ab48e2ef2b12973d18da Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Tue, 28 Sep 2010 19:23:25 +0200 Subject: 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 --- mkspecs/features/symbian/sis_targets.prf | 1 - qmake/generators/symbian/symmake_abld.cpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf index 800a04c..c92fc79 100644 --- a/mkspecs/features/symbian/sis_targets.prf +++ b/mkspecs/features/symbian/sis_targets.prf @@ -127,7 +127,6 @@ equals(GENERATE_SIS_TARGETS, true) { && echo $${shellFixedHash} Version : >> $$make_cache_name \ && echo $${shellFixedHash} >> $$make_cache_name \ && echo $${shellFixedHash} ============================================================================== >> $$make_cache_name \ - && echo. >> $$make_cache_name \ && echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> $$make_cache_name QMAKE_EXTRA_TARGETS += store_build_target 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; } } -- cgit v0.12