summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-17 09:39:08 (GMT)
committeraxis <qt-info@nokia.com>2009-11-17 12:47:22 (GMT)
commit78474a65e4f61e9d1ae8116d5b690cf78729aa71 (patch)
tree337695f109fb963ed1312ef86b2d0385b3bdcf6f
parent2d8d855de79a38e16b9229f3ef9400661e8e3259 (diff)
downloadQt-78474a65e4f61e9d1ae8116d5b690cf78729aa71.zip
Qt-78474a65e4f61e9d1ae8116d5b690cf78729aa71.tar.gz
Qt-78474a65e4f61e9d1ae8116d5b690cf78729aa71.tar.bz2
Improving parts of commit 2d8d855d.
It breaks Symbian on Windows, so instead use an approach that works on all platforms.
-rw-r--r--qmake/generators/symbian/symmake_abld.cpp30
1 files changed, 20 insertions, 10 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index b06db2f..8e6c4fa 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -440,21 +440,31 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t)
void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t)
{
+#ifdef Q_OS_WIN
+#define HASH "#"
+#define EMPTYECHO "."
+#else
+#define HASH "\\#"
+#define EMPTYECHO
+#endif
+
t << STORE_BUILD_TARGET ":" << endl;
- t << "\t@echo \\# ============================================================================== > " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# This file is generated by make and should not be modified by the user >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# Name : " << MAKE_CACHE_NAME << " >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# Part of : " << project->values("TARGET").join(" ") << " >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# Description : This file is used to cache last build target for >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# make sis target. >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# Version : >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo \\# ============================================================================== >> " MAKE_CACHE_NAME << endl;
- t << "\t@echo >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " ============================================================================== > " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " This file is generated by make and should not be modified by the user >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " Name : " << MAKE_CACHE_NAME << " >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " Part of : " << project->values("TARGET").join(" ") << " >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " Description : This file is used to cache last build target for >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " make sis target. >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " Version : >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo " HASH " ============================================================================== >> " MAKE_CACHE_NAME << endl;
+ t << "\t@echo" EMPTYECHO " >> " MAKE_CACHE_NAME << endl;
t << "\t@echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> " MAKE_CACHE_NAME << endl;
t << endl;
generatedFiles << MAKE_CACHE_NAME;
+#undef HASH
+#undef EMPTYECHO
}
void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension)