diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-02-24 08:26:12 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-02-24 08:26:12 (GMT) |
| commit | fb111f9b71c99aa06dcf30dfada0d3b12c7ac993 (patch) | |
| tree | 2e9437eb607e7f9bef7a42448bbe22ceb6f09b5d /qmake/project.cpp | |
| parent | 526c6fd4686a8e87e5087ebcac941405f742304a (diff) | |
| parent | 3866c80dfe2b932c9460946fae88e0f0e2d7aa56 (diff) | |
| download | Qt-fb111f9b71c99aa06dcf30dfada0d3b12c7ac993.zip Qt-fb111f9b71c99aa06dcf30dfada0d3b12c7ac993.tar.gz Qt-fb111f9b71c99aa06dcf30dfada0d3b12c7ac993.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 8871152..4193163 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -44,8 +44,6 @@ #include "option.h" #include "cachekeys.h" -#include "epocroot.h" - #include <qdatetime.h> #include <qfile.h> #include <qfileinfo.h> @@ -64,6 +62,9 @@ #include <stdio.h> #include <stdlib.h> +// Included from tools/shared +#include <symbian/epocroot.h> + #ifdef Q_OS_WIN32 #define QT_POPEN _popen #define QT_PCLOSE _pclose |