diff options
| author | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
| commit | 1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch) | |
| tree | 8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /qmake/generators/symbian/symmake_abld.cpp | |
| parent | 0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff) | |
| parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
| download | Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'qmake/generators/symbian/symmake_abld.cpp')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 10c201c..5dfdacc 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -368,10 +368,6 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool writeDeploymentTargets(t); - writeSisTargets(t); - - writeStoreBuildTarget(t); - generateDistcleanTargets(t); t << "clean: $(ABLD)" << endl; @@ -446,35 +442,6 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t) return true; } -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 " 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) { // Normally emulator deployment gets done via regular makefile, but since subdirs |