Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team

1 files changed, 8 insertions, 11 deletions

diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 78a9024..cc32f8d 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -624,11 +624,11 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     // are not necessary.
     QStringList allPreDeps;
     foreach(QString item, project->values("PRE_TARGETDEPS")) {
-        allPreDeps.append(fileInfo(item).absoluteFilePath());
+        allPreDeps.append(QDir::cleanPath(outputDir.absoluteFilePath(item)));
     }
 
     foreach (QString item, project->values("GENERATED_SOURCES")) {
-        allPreDeps.append(fileInfo(item).absoluteFilePath());
+        allPreDeps.append(QDir::cleanPath(outputDir.absoluteFilePath(item)));
     }
 
     for (QMap<QString, QStringList>::iterator it = sources.begin(); it != sources.end(); ++it) {
@@ -638,7 +638,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
             QString sourceFile = currentSourcePath + "/" + values.at(i);
             QStringList deps = findDependencies(QDir::toNativeSeparators(sourceFile));
             foreach(QString depItem, deps) {
-                appendIfnotExist(allPreDeps, fileInfo(depItem).absoluteFilePath());
+                appendIfnotExist(allPreDeps, QDir::cleanPath(outputDir.absoluteFilePath(depItem)));
             }
         }
     }
@@ -649,7 +649,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     foreach(QString item, extraTargets) {
         foreach(QString targetItem, project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_TARGETS.") + item)) {
             // Make sure targetpath is absolute
-            QString absoluteTarget = fileInfo(targetItem).absoluteFilePath();
+            QString absoluteTarget = QDir::cleanPath(outputDir.absoluteFilePath(targetItem));
             if (allPreDeps.contains(absoluteTarget)) {
                 QStringList deps = project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + item + targetItem);
                 QString commandItem =  project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + item + targetItem).join(" ");
@@ -658,7 +658,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
                 QString absoluteDeps;
                 foreach (QString depItem, deps) {
                     if (!depItem.isEmpty()) {
-                        absoluteDeps.append(fileInfo(depItem).absoluteFilePath());
+                        absoluteDeps.append(QDir::cleanPath(outputDir.absoluteFilePath(depItem)));
                         absoluteDeps.append(" ");
                     }
                 }
@@ -723,9 +723,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
 
         QFileInfo iconInfo = fileInfo(icon);
 
-        QFileInfo bldinf(project->values("MAKEFILE").first());
-        QString iconPath = bldinf.dir().relativeFilePath(iconInfo.path());
-
+        QString iconPath = outputDir.relativeFilePath(iconInfo.absolutePath());
         QString iconFile = iconInfo.baseName();
 
         QFileInfo iconTargetInfo = fileInfo(iconTargetFile);
@@ -747,11 +745,10 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     if (!cleanFiles.isEmpty()) {
         QStringList absoluteCleanFiles;
         foreach (QString cleanFile, cleanFiles) {
-            QFileInfo fi(cleanFile);
             QString fileName = QLatin1String("\"");
-            fileName.append(fi.absoluteFilePath());
+            fileName.append(QDir::cleanPath(outputDir.absoluteFilePath(cleanFile)));
             fileName.append(QLatin1String("\""));
-            absoluteCleanFiles << fileName;   	
+            absoluteCleanFiles << fileName;
         }
         t << "START EXTENSION qt/qmake_clean" << endl;
         t << "OPTION CLEAN_FILES " << absoluteCleanFiles.join(" ") << endl;