diff options
| author | axis <qt-info@nokia.com> | 2009-11-23 08:44:52 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-23 08:44:52 (GMT) |
| commit | 76b66d6da548ce4a247727f14e09b1d301330db5 (patch) | |
| tree | 0e678a4e278af8c2ddb5ebd35f572dd331cd6dd6 /qmake | |
| parent | 50465c3409d699612a59b6c1d16e3502bb3a92fd (diff) | |
| parent | 1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff) | |
| download | Qt-76b66d6da548ce4a247727f14e09b1d301330db5.zip Qt-76b66d6da548ce4a247727f14e09b1d301330db5.tar.gz Qt-76b66d6da548ce4a247727f14e09b1d301330db5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 4fd5833..c7eae64 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -376,7 +376,10 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << "START EXTENSION s60/mifconv" << endl; QFileInfo iconInfo = fileInfo(icon); - QString iconPath = iconInfo.path(); + + QFileInfo bldinf(project->values("MAKEFILE").first()); + QString iconPath = bldinf.dir().relativeFilePath(iconInfo.path()); + QString iconFile = iconInfo.baseName(); QFileInfo iconTargetInfo = fileInfo(iconTargetFile); |