diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 3d24053..7973e49 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -88,7 +88,7 @@ QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const Q static QString epocRootStr; if (epocRootStr.isEmpty()) { QFileInfo efi(epocRoot()); - epocRootStr = efi.canonicalFilePath(); + epocRootStr = efi.absoluteFilePath(); if (epocRootStr.isEmpty()) { fprintf(stderr, "Unable to resolve epocRoot '%s' to real dir on current drive, defaulting to '/' for mmp paths\n", qPrintable(epocRoot())); epocRootStr = "/"; @@ -122,7 +122,7 @@ QString SymbianMakefileGenerator::canonizePath(const QString& origPath) static QString defaultPath; if (defaultPath.isEmpty()) { QFileInfo fi("."); - defaultPath = fi.canonicalFilePath(); + defaultPath = fi.absoluteFilePath(); } // Prepend epocroot to any paths beginning with "/epoc32/" @@ -131,10 +131,12 @@ QString SymbianMakefileGenerator::canonizePath(const QString& origPath) resultPath = QDir::fromNativeSeparators(epocRoot()) + resultPath.mid(1); QFileInfo fi(fileInfo(resultPath)); - if (fi.isDir()) { - resultPath = fi.canonicalFilePath(); + if(!fi.exists()) { + resultPath = QString(); + } else if (fi.isDir()) { + resultPath = fi.absoluteFilePath(); } else { - resultPath = fi.canonicalPath(); + resultPath = fi.absolutePath(); } resultPath = QDir::cleanPath(resultPath); diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 4d1673b..81051e7 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -150,7 +150,7 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, b t << "FINAL: " << finalDeps << endl; t << "endif" << endl << endl; - QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).canonicalFilePath())); + QString makefile(Option::fixPathToTargetOS(fileInfo(wrapperFileName).absoluteFilePath())); foreach(QString target, wrapperTargets) { t << target << " : " << makefile << endl; t << "\t-$(MAKE) -f \"" << makefile << "\" " << target << " QT_SIS_TARGET=$(VISUAL_CFG)-$(PLATFORM)" << endl << endl;