Fix SymbianMakefileGenerator::absolutizePath for clean builds

QFileInfo::isDir() will not return correct value if path doesn't exist
like it doesn't in case of clean builds. Turned the check around
and used isFile() instead. If a file is given as origPath, it is
assumed to exist, because it was explicitly given with HEADERS variable
and qmake will give warning if nonexisted file is given there.

Reviewed-by: Janne Koskinen

1 files changed, 7 insertions, 3 deletions

diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index a7eca540fd..ee579bb9f4 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -147,10 +147,14 @@ QString SymbianMakefileGenerator::absolutizePath(const QString& origPath)
         resultPath = QDir::fromNativeSeparators(epocRoot()) + resultPath.mid(1);
 
     QFileInfo fi(fileInfo(resultPath));
-    if (fi.isDir()) {
-        resultPath = fi.absoluteFilePath();
-    } else {
+
+    // Since origPath can be something given in HEADERS, we need to check if we are dealing
+    // with a file or a directory. In case the origPath doesn't yet exist, isFile() returns
+    // false and we default to assuming it is a dir.
+    if (fi.isFile()) {
         resultPath = fi.absolutePath();
+    } else {
+        resultPath = fi.absoluteFilePath();
     }
 
     resultPath = QDir::cleanPath(resultPath);