diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-25 08:49:35 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-25 09:03:36 (GMT) |
commit | 1cf0b9e36eaab3bf593509260e8a2de0c85548bb (patch) | |
tree | 2a2a60698430fd039cb6957c0f5f1c801ce73666 /qmake | |
parent | 677f1b4af363845189d93bf564ab9ba97eb160e0 (diff) | |
download | Qt-1cf0b9e36eaab3bf593509260e8a2de0c85548bb.zip Qt-1cf0b9e36eaab3bf593509260e8a2de0c85548bb.tar.gz Qt-1cf0b9e36eaab3bf593509260e8a2de0c85548bb.tar.bz2 |
Misc fixes to FLM files
1) FLMs should not have more than one phase dependency -> removed extra
dependencies, leaving only what is actually necessary.
2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete
3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm
so that unrelated components can continue building instead of
halting the whole build at EXPORT phase.
4) Added .export to qmake_extra_pre_targetdep interface so that it is
actually executed in EXPORT phase where it should be.
Task-number: QTBUG-8513
Reviewed-by: Janne Koskinen
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 3eb3059..8289f7f 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -362,7 +362,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t } } - t << "START EXTENSION qt/qmake_extra_pre_targetdep" << endl; + t << "START EXTENSION qt/qmake_extra_pre_targetdep.export" << endl; t << "OPTION PREDEP_TARGET " << absoluteTarget << endl; t << "OPTION DEPS " << absoluteDeps << endl; |