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)
committeraxis <qt-info@nokia.com>2010-02-23 08:23:07 (GMT)
commit295e3dd7e07c7a1788e3dce4446eab9a608f99e6 (patch)
treeb6c52403eeac9b06aedf59415a3a9e4f00b05f36 /qmake/project.cpp
parentba301c2e265f3132906254b145fad394eeb4091f (diff)
downloadQt-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.zip
Qt-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.tar.gz
Qt-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.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 (cherry picked from commit 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7)
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 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