diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-01-05 09:27:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-01-05 09:40:40 (GMT) |
| commit | 0dc7587b4333ae201b960be01517ad9911fcb3e2 (patch) | |
| tree | 45036c62078a6555149b9f66fa749bd9c76d6cc8 /qmake/generators | |
| parent | 741a5b0cef49c70c8c5da2481e996399e81aaf63 (diff) | |
| download | Qt-0dc7587b4333ae201b960be01517ad9911fcb3e2.zip Qt-0dc7587b4333ae201b960be01517ad9911fcb3e2.tar.gz Qt-0dc7587b4333ae201b960be01517ad9911fcb3e2.tar.bz2 | |
Minor logic fix to Symbian generator in qmake
The include meant to be under restore_build was getting included always.
This is actually how it should work, so removed the empty restore_build
target entirely.
Reviewed-by: Janne Anttila
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index f3339af..b2709d1 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -91,7 +91,6 @@ #define OK_SIS_TARGET "ok_sis" #define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg" #define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache" -#define RESTORE_BUILD_TARGET "restore_build" #define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename)); @@ -1762,7 +1761,10 @@ void SymbianMakefileGenerator::removeSpecialCharacters(QString& str) void SymbianMakefileGenerator::writeSisTargets(QTextStream &t) { - t << SIS_TARGET ": " RESTORE_BUILD_TARGET << endl; + t << "-include " MAKE_CACHE_NAME << endl; + t << endl; + + t << SIS_TARGET ":" << endl; QString siscommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \ "$(MAKE) -s -f $(MAKEFILE) %4," \ "$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) %4," \ @@ -1793,11 +1795,6 @@ void SymbianMakefileGenerator::writeSisTargets(QTextStream &t) t << FAIL_SIS_NOCACHE_TARGET ":" << endl; t << "\t$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)" << endl; t << endl; - - - t << RESTORE_BUILD_TARGET ":" << endl; - t << "-include " MAKE_CACHE_NAME << endl; - t << endl; } void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t) |