diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-12 12:03:06 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-13 08:56:54 (GMT) |
| commit | c5fad066761030489c9a0221a409518d18c45ef8 (patch) | |
| tree | 6c428071c3cd789cd9333c8748c5293ea52c0e30 | |
| parent | 6a4bb9e215e0e33a1e1ca926f93bdea89d1ec042 (diff) | |
| download | Qt-c5fad066761030489c9a0221a409518d18c45ef8.zip Qt-c5fad066761030489c9a0221a409518d18c45ef8.tar.gz Qt-c5fad066761030489c9a0221a409518d18c45ef8.tar.bz2 | |
Make bld.inf target in Symbian mkspecs to depend on .pro file
Changes to .pro file weren't previously noticed and therefore
qmake wasn't rerun. Qmake command itself was also incorrect.
Task-number: QTBUG-12716
Reviewed-by: Shane Kearns
(cherry picked from commit 142ce4d38094f1588b04758a6f9ff6787a784fe3)
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 12 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 11 |
2 files changed, 15 insertions, 8 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index d60528b..01954f5 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -253,13 +253,17 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool } else { t << "all: debug release" << endl; t << endl; + + QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); + t << "qmake:" << endl; - t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName() - << "\" \"" << project->projectFile() << "\"" << endl; + t << qmakeCmd << endl; t << endl; - t << BLD_INF_FILENAME ":" << endl; - t << "\t$(QMAKE)" << endl; + + t << BLD_INF_FILENAME ": " << project->projectFile() << endl; + t << qmakeCmd << endl; t << endl; + t << "$(ABLD): " BLD_INF_FILENAME << endl; t << "\tbldmake bldfiles" << endl; t << endl; diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 534a080..036eb1d 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -278,12 +278,15 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo } else { t << "all: debug release" << endl; t << endl; + + QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); + t << "qmake:" << endl; - t << "\t$(QMAKE) -spec symbian-sbsv2 -o \"" << fileInfo(Option::output.fileName()).fileName() - << "\" \"" << project->projectFile() << "\"" << endl; + t << qmakeCmd << endl; t << endl; - t << BLD_INF_FILENAME ":" << endl; - t << "\t$(QMAKE)" << endl; + + t << BLD_INF_FILENAME ": " << project->projectFile() << endl; + t << qmakeCmd << endl; t << endl; QString currentClause; |