diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-22 13:36:28 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-22 13:36:28 (GMT) |
| commit | f5cf5593cb60687034a86faaa4e958428393b0a3 (patch) | |
| tree | d139510d7b98b0b8a00b17f8d381e1be2de0a923 /qmake | |
| parent | c24da6375547e0648beaf0b6d2fb91ff312aacdd (diff) | |
| download | Qt-f5cf5593cb60687034a86faaa4e958428393b0a3.zip Qt-f5cf5593cb60687034a86faaa4e958428393b0a3.tar.gz Qt-f5cf5593cb60687034a86faaa4e958428393b0a3.tar.bz2 | |
Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
The .make.cache file contents are ignored if QT_SIS_TARGET environment
variable is set, so there is no point in requiring its existence in
those cases.
Task-number: QTBUG-4617
Reviewed-by: Janne Anttila
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 14177b5..ddda848 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1764,7 +1764,9 @@ void SymbianMakefileGenerator::writeSisTargets(QTextStream &t) { t << SIS_TARGET ": " RESTORE_BUILD_TARGET << endl; QString siscommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \ - "$(MAKE) -s -f $(MAKEFILE) %4,$(MAKE) -s -f $(MAKEFILE) %5)," \ + "$(MAKE) -s -f $(MAKEFILE) %4," \ + "$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) %4," \ + "$(MAKE) -s -f $(MAKEFILE) %5))," \ "$(MAKE) -s -f $(MAKEFILE) %6)") .arg(fixedTarget) .arg("pkg") @@ -1789,7 +1791,7 @@ void SymbianMakefileGenerator::writeSisTargets(QTextStream &t) t << endl; t << FAIL_SIS_NOCACHE_TARGET ":" << endl; - t << "\t$(error Project has to be build before calling 'SIS' 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; |