diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
| commit | a305814f8f59f634943d8d5f8d87d2fd49891cb3 (patch) | |
| tree | 42ed4e6afecbf36af2750e2eeaed87117ab942a6 /qmake/project.cpp | |
| parent | 6258fc281f5b66b2634b81a2633b117165cea7ef (diff) | |
| parent | 1337a3e031477aa4d628d01252557dee622629ff (diff) | |
| download | Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.zip Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.gz Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index fe08b7b..2586c57 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -64,7 +64,7 @@ #include <stdlib.h> // Included from tools/shared -#include <symbian/epocroot.h> +#include <symbian/epocroot_p.h> #ifdef Q_OS_WIN32 #define QT_POPEN _popen @@ -3118,7 +3118,7 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList false)); } else if (var == QLatin1String("EPOCROOT")) { if (place[var].isEmpty()) - place[var] = QStringList(epocRoot()); + place[var] = QStringList(qt_epocRoot()); } #if defined(Q_OS_WIN32) && defined(Q_CC_MSVC) else if(var.startsWith(QLatin1String("QMAKE_TARGET."))) { |