From 349dd6ef5cbba0c45d8089a3cf65f587c2662c4d Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Thu, 28 May 2009 13:59:31 +0300
Subject: Fixed Qt/Symbian compilation with -stl configure option.

The STL enabled config does not have implicit include for e32base.h.
---
 src/plugins/s60/src/qdesktopservices_3_2.cpp | 4 +++-
 src/plugins/s60/src/qlocale_3_2.cpp          | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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)
 {
-- 
cgit v0.12