summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian/symmake_abld.cpp
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2010-02-24 04:16:04 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2010-02-24 04:16:04 (GMT)
commit6680766bcdd5bff7f1a871c711202a30fe91e25e (patch)
tree668400393f44d7abf6099bb1ce78d431902e1b63 /qmake/generators/symbian/symmake_abld.cpp
parentd3e494b78a00a8109005b2c86605920799ad12c8 (diff)
parent4d615766184e3eeee25ffc634847bec1edd47ac0 (diff)
downloadQt-6680766bcdd5bff7f1a871c711202a30fe91e25e.zip
Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.gz
Qt-6680766bcdd5bff7f1a871c711202a30fe91e25e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts: configure
Diffstat (limited to 'qmake/generators/symbian/symmake_abld.cpp')
-rw-r--r--qmake/generators/symbian/symmake_abld.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 9b7ae3e..81165f5 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -48,6 +48,9 @@
#include <qdatetime.h>
#include <qdebug.h>
+// Included from tools/shared
+#include <symbian/epocroot.h>
+
#define DO_NOTHING_TARGET "do_nothing"
#define CREATE_TEMPS_TARGET "create_temps"
#define EXTENSION_CLEAN "extension_clean"