Changeset 769 for trunk/qmake/project.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/project.cpp (modified) (3 diffs)

trunk/qmake/project.cpp

@@ -45 +45 @@
 #include "cachekeys.h"
 
-#include "epocroot.h"
-
 #include <qdatetime.h>
 #include <qfile.h>
@@ -66 +64 @@
 #include <stdio.h>
 #include <stdlib.h>
+
+// Included from tools/shared
+#include <symbian/epocroot.h>
 
 #ifdef Q_OS_WIN32
@@ -3076 +3077 @@
     } else if(var == QLatin1String("_PRO_FILE_PWD_")) {
         var = ".BUILTIN." + var;
-        place[var] =  QStringList(QFileInfo(pfile).absolutePath());
+        place[var] = QStringList(pfile.isEmpty() ? qmake_getpwd() : QFileInfo(pfile).absolutePath());
     } else if(var == QLatin1String("_QMAKE_CACHE_")) {
         var = ".BUILTIN." + var;