diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-23 03:42:37 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-23 03:42:37 (GMT) |
| commit | aa90ed9a169b169fc1ea6bcc9f4588785957b4d8 (patch) | |
| tree | a35a505f45a7804a2cf3548a9f43cadcdf9d4b86 /qmake/project.cpp | |
| parent | 04532ba052559b265b1bc85dc143d8aeeb02149f (diff) | |
| parent | 53523bd15cb977ca066a951bae3cc7501d77e143 (diff) | |
| download | Qt-aa90ed9a169b169fc1ea6bcc9f4588785957b4d8.zip Qt-aa90ed9a169b169fc1ea6bcc9f4588785957b4d8.tar.gz Qt-aa90ed9a169b169fc1ea6bcc9f4588785957b4d8.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
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 4ce8ba4..e4ef7dd 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 |