summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-10 14:57:51 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-18 16:34:11 (GMT)
commit13cb80be958c40077245cbc4b36448a661e30c64 (patch)
treef3b435e1532ba3fd1cc5a4ae12b08c4d6c232234 /qmake/project.cpp
parentf641369ceb7b7e2f95b9d0656b34c0517c5b95f7 (diff)
downloadQt-13cb80be958c40077245cbc4b36448a661e30c64.zip
Qt-13cb80be958c40077245cbc4b36448a661e30c64.tar.gz
Qt-13cb80be958c40077245cbc4b36448a661e30c64.tar.bz2
Factored epocRoot implementation out of qmake
This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp5
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