diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-01-25 11:49:46 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-26 07:31:51 (GMT) |
| commit | bc1bc8e5cd7afa81a6680ee4b043753d8764e578 (patch) | |
| tree | 16a9f77d86e365c33ec837816236aa8685cfa5a6 | |
| parent | 30cc65cc395d2793a5ea43fdc34373c07f07dffd (diff) | |
| download | Qt-bc1bc8e5cd7afa81a6680ee4b043753d8764e578.zip Qt-bc1bc8e5cd7afa81a6680ee4b043753d8764e578.tar.gz Qt-bc1bc8e5cd7afa81a6680ee4b043753d8764e578.tar.bz2 | |
Fix QMAKE_POST_LINK in Symbian for targets with special characters.
Proper fixed targets was not used to generate the dependency for
QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen
before actual linking.
Task-number: QTBUG-16881
Reviewed-by: axis
(cherry picked from commit 41297f2d592ef21327b5c7523c52c1ecd3c727f4)
| -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 6d01523..9eccd46 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -686,7 +686,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t fixFlmCmd(&postLinkCmd, commandsToReplace); t << "START EXTENSION qt/qmake_post_link" << endl; t << "OPTION POST_LINK_CMD " << postLinkCmd << endl; - t << "OPTION LINK_TARGET " << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".").append(getTargetExtension())) << endl; + t << "OPTION LINK_TARGET " << fixedTarget << QLatin1String(".") << getTargetExtension() << endl; t << "END" << endl; t << endl; } |