diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 16:13:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 16:13:55 (GMT) |
| commit | 41de32155e0a862ec7f6aacbcf985f06950bfda9 (patch) | |
| tree | 9fe6b20d6e0b12fb53a0398f67f0a2702a9ad750 /qmake | |
| parent | b885787eee96f444e73c7a9d6f6b63f65ef2c172 (diff) | |
| parent | 5498dcd7b10e147734a3414cab824b8b435aa3d9 (diff) | |
| download | Qt-41de32155e0a862ec7f6aacbcf985f06950bfda9.zip Qt-41de32155e0a862ec7f6aacbcf985f06950bfda9.tar.gz Qt-41de32155e0a862ec7f6aacbcf985f06950bfda9.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
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 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; } |