summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-05-28 10:59:31 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-05-28 10:59:31 (GMT)
commit349dd6ef5cbba0c45d8089a3cf65f587c2662c4d (patch)
tree24f9f79e7ecae8385901f0a4dfc3d40bc2f18306
parent2f42ad94f671d50568afa2a1d0ef82e921cc73a0 (diff)
downloadQt-349dd6ef5cbba0c45d8089a3cf65f587c2662c4d.zip
Qt-349dd6ef5cbba0c45d8089a3cf65f587c2662c4d.tar.gz
Qt-349dd6ef5cbba0c45d8089a3cf65f587c2662c4d.tar.bz2
Fixed Qt/Symbian compilation with -stl configure option.
The STL enabled config does not have implicit include for e32base.h.
-rw-r--r--src/plugins/s60/src/qdesktopservices_3_2.cpp4
-rw-r--r--src/plugins/s60/src/qlocale_3_2.cpp1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/s60/src/qdesktopservices_3_2.cpp b/src/plugins/s60/src/qdesktopservices_3_2.cpp
index e563c14..679b370 100644
--- a/src/plugins/s60/src/qdesktopservices_3_2.cpp
+++ b/src/plugins/s60/src/qdesktopservices_3_2.cpp
@@ -10,10 +10,12 @@
****************************************************************************/
#include <private/qcore_symbian_p.h>
-#include <cdirectorylocalizer.h> // CDirectoryLocalizer
#include <qstring.h>
#include <qdir.h>
+#include <e32base.h> // CBase -> Required by cdirectorylocalizer.h
+#include <cdirectorylocalizer.h> // CDirectoryLocalizer
+
EXPORT_C QString localizedDirectoryName(QString& rawPath)
{
QString ret;
diff --git a/src/plugins/s60/src/qlocale_3_2.cpp b/src/plugins/s60/src/qlocale_3_2.cpp
index 027eefc..fe1d642 100644
--- a/src/plugins/s60/src/qlocale_3_2.cpp
+++ b/src/plugins/s60/src/qlocale_3_2.cpp
@@ -10,6 +10,7 @@
****************************************************************************/
#include <e32std.h>
+#include <e32base.h>
EXPORT_C TPtrC defaultGetLongDateFormatSpec(TExtendedLocale& locale)
{