diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 18:13:03 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 18:13:03 (GMT) |
| commit | f05e08c1effde6641d9ac23df2a7d9219afdad96 (patch) | |
| tree | 585a574e588f585eefb17ec54c27cad0ca027dbd /qmake/project.cpp | |
| parent | 9221250e01c78e77ce92d69e012053c46c2e3679 (diff) | |
| download | Qt-f05e08c1effde6641d9ac23df2a7d9219afdad96.zip Qt-f05e08c1effde6641d9ac23df2a7d9219afdad96.tar.gz Qt-f05e08c1effde6641d9ac23df2a7d9219afdad96.tar.bz2 | |
Revert "Factored epocRoot implementation out of qmake"
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 4193163..8871152 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -44,6 +44,8 @@ #include "option.h" #include "cachekeys.h" +#include "epocroot.h" + #include <qdatetime.h> #include <qfile.h> #include <qfileinfo.h> @@ -62,9 +64,6 @@ #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 |