summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-19 08:50:34 (GMT)
committeraxis <qt-info@nokia.com>2010-02-19 08:50:34 (GMT)
commit603dc7d659084c5d092de79fec08a0baca8eaa59 (patch)
tree383eb16d49c8b59b9bab920932b906eb1f0d192e /qmake/project.cpp
parented604d1a6420c1e6598b7d509dd108aa20db4509 (diff)
downloadQt-603dc7d659084c5d092de79fec08a0baca8eaa59.zip
Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.tar.gz
Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.tar.bz2
Revert "Factored epocRoot implementation out of qmake"
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index e4ef7dd..4ce8ba4 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