summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure.exebin535040 -> 1183744 bytes
-rw-r--r--src/plugins/s60/src/qdesktopservices_3_2.cpp4
-rw-r--r--src/plugins/s60/src/qlocale_3_2.cpp1
-rw-r--r--tools/configure/configureapp.cpp2
4 files changed, 5 insertions, 2 deletions
diff --git a/configure.exe b/configure.exe
index 30383d8..b3e68c2 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ
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)
{
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a879e5d..40caff0 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1405,7 +1405,7 @@ void Configure::applySpecSpecifics()
dictionary[ "QT3SUPPORT" ] = "no";
dictionary[ "OPENGL" ] = "no";
dictionary[ "OPENSSL" ] = "no";
- dictionary[ "STL" ] = "no";
+ dictionary[ "STL" ] = "yes";
dictionary[ "EXCEPTIONS" ] = "no";
dictionary[ "RTTI" ] = "no";
dictionary[ "ARCHITECTURE" ] = "symbian";