diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-11-20 10:32:25 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-11-20 10:32:25 (GMT) |
| commit | 7e0e7abcfea715ae17c560e7903100a1f3ee0aeb (patch) | |
| tree | f3834aa6c0556bbe70168febb0613bcc8ee0f0c8 | |
| parent | d9fa92933ff6ff1afad342f7f94e37f810cf8176 (diff) | |
| download | Qt-7e0e7abcfea715ae17c560e7903100a1f3ee0aeb.zip Qt-7e0e7abcfea715ae17c560e7903100a1f3ee0aeb.tar.gz Qt-7e0e7abcfea715ae17c560e7903100a1f3ee0aeb.tar.bz2 | |
Fix ICON keyword to work with absolute paths also in SBSv2.
Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
| -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); |