From 1c05257ed6de27c7d9dcc90f23f868035eb738e5 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 11 Feb 2011 13:51:48 +0100
Subject: Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.

Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion.
Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf.

RevBy: Miikka Heikkinen
Backport from 7c12d841fb2e2963b506c1ffc857cdd88bf78f6c in master.
---
 mkspecs/symbian/linux-gcce/qmake.conf | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
index 4c346da..62cc9ae 100644
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ b/mkspecs/symbian/linux-gcce/qmake.conf
@@ -50,8 +50,7 @@ QMAKE_LFLAGS_NOUNDEF	=
 QMAKE_LFLAGS_RPATH	= --rpath=
 
 DEFINES		+= __GCCE__ \
-                   UNICODE \
-                   _STLP_NO_EXCEPTION_HEADER
+                   UNICODE
 
 QMAKE_LFLAGS_APP        += --entry=_E32Startup -u _E32Startup
 QMAKE_LFLAGS_SHLIB      += --default-symver --entry=_E32Dll -u _E32Dll
@@ -89,7 +88,5 @@ INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \
     $${EPOCROOT}/epoc32/include/variant \
     $${EPOCROOT}/epoc32/include/stdapis \
     $${EPOCROOT}/epoc32/include/gcce \
-    ${EPOCROOT}/epoc32/include/stdapis/sys \
-    ${EPOCROOT}/epoc32/include/stdapis/stlport \
     $$INCLUDEPATH
 
-- 
cgit v0.12


From 46de2eb6aacc862b60cb01cc6a0c5e1775265099 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 11 Feb 2011 13:53:34 +0100
Subject: Apply the gcce link rules for LIBS_PRIVATE too.

It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least.

RevBy: axis
---
 mkspecs/features/symbian/symbian_building.prf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index f3b6c25..0d2e053 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -51,7 +51,7 @@ defineReplace(processSymbianLibrary) {
 }
 
 # This part turn "-llibc" into "libc.dso", and moves -L entries to QMAKE_LIBDIR.
-libsToProcess = LIBS QMAKE_LIBS
+libsToProcess = LIBS LIBS_PRIVATE QMAKE_LIBS
 for(libToProcess, libsToProcess) {
     qt_libraries = $$split($$libToProcess, " ")
     eval($$libToProcess =)
@@ -90,8 +90,8 @@ count(splitVersion, 0) {
 } else {
     count(splitVersion, 3) {
         hexVersion = $$system("sh -c 'printf %02x $$member(splitVersion, 0)'")
-        hexPart2 = $$system("sh -c 'printf %02x $$member(splitVersion, 1)'")"
-        hexPart2 = $$hexPart2$$system("sh -c 'printf %02x $$member(splitVersion, 2)'")"
+        hexPart2 = $$system("sh -c 'printf %02x $$member(splitVersion, 1)'")
+        hexPart2 = $$hexPart2$$system("sh -c 'printf %02x $$member(splitVersion, 2)'")
         decVersion = $$system("sh -c 'printf %1d 0x$$hexVersion'").
         hexVersion = $$hexVersion$$hexPart2
         decVersion = $$decVersion$$system("sh -c 'printf %d 0x$$hexPart2'")
-- 
cgit v0.12


From 984bc6626c4f290572ac721fd10edda99691306f Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 14 Feb 2011 10:12:21 +0100
Subject: Worked around a SC issue in S60 3.x vs 5.0 versions.

Task:     QTBUG-16578
RevBy:    Gareth Stockwell
---
 src/gui/kernel/qwidget_s60.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 1551162..af9ae47 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -54,7 +54,6 @@
 
 #ifdef Q_WS_S60
 #include <aknappui.h>
-#include <akntoolbar.h>
 #include <eikbtgpc.h>
 #endif
 
@@ -64,6 +63,19 @@
 // CCoeControl objects until after the CONE event handler has finished running.
 Q_DECLARE_METATYPE(WId)
 
+// Workaround for the fact that S60 SDKs 3.x do not contain the akntoolbar.h
+// header, even though the documentation says that it should be there, and indeed
+// it is present in the library.
+class CAknToolbar : public CAknControl,
+                    public MCoeControlObserver,
+                    public MCoeControlBackground,
+                    public MEikCommandObserver,
+                    public MAknFadedComponent
+{
+public:
+    IMPORT_C void SetToolbarVisibility(const TBool visible);
+};
+
 QT_BEGIN_NAMESPACE
 
 extern bool qt_nograb();
-- 
cgit v0.12