Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
  Have the backing store destroyed also in special Symbian scenarios.
  Use FixNativeOrientation on Symbian when the application wants it.
  QS60Style: itemview item with checkbox and text is drawn incorrectly
  Revert "Have the backing store destroyed also in special Symbian scenarios."
  Add focus frame support in style sheet
  Two QListView autotests do not pass on Symbian^3 releases
  tst_QStyle::drawItemPixmap test case fails on Symbian^3
  Add the auto detection for OpenVG in configure
  Add focus frame support in stylesheet
  Make QS60Style to support new Tab graphics in new Symbian releases
  GraphicsView is not reset if focusItem is not set when keyboard closes
  Check the validity of qt_desktopWidget before dereferencing
  Labels are not visible in dialogs with all themes (part2)
  Labels are not visible in dialogs with all themes
  Enable webkit for symbian-gcce in configure
  Enable webkit build for the makefile build system with gcce
  Add the rules for gcce in do_not_build_as_thumb.prf
  Correct some parameters for the makefile build sytem, armcc and gcce
  Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
  Do not unnecessarily draw application twice in landscape
  ...

5 files changed, 15 insertions, 8 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index e35786b..f955e3c 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -57,7 +57,8 @@ QMAKE_INCDIR		=
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 
 QMAKE_LFLAGS            =
-QMAKE_LFLAGS.ARMCC      = 
+QMAKE_LFLAGS.ARMCC      =
+QMAKE_LFLAGS.GCCE       =
 QMAKE_LFLAGS_EXCEPTIONS_ON =
 QMAKE_LFLAGS_EXCEPTIONS_OFF =
 QMAKE_LFLAGS_RELEASE    =
diff --git a/mkspecs/features/symbian/do_not_build_as_thumb.prf b/mkspecs/features/symbian/do_not_build_as_thumb.prf
index 0f1fd9f..91a63c2 100644
--- a/mkspecs/features/symbian/do_not_build_as_thumb.prf
+++ b/mkspecs/features/symbian/do_not_build_as_thumb.prf
@@ -5,4 +5,9 @@ symbian-abld|symbian-sbsv2 {
     QMAKE_CFLAGS += --arm
     QMAKE_CXXFLAGS -= --thumb
     QMAKE_CXXFLAGS += --arm
+} else:symbian-gcce {
+    QMAKE_CFLAGS -= --thumb
+    QMAKE_CFLAGS += -marm -mthumb-interwork -mapcs
+    QMAKE_CXXFLAGS -= --thumb
+    QMAKE_CXXFLAGS += -marm -mthumb-interwork -mapcs
 }
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 28046b4..8c75707 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -1,6 +1,7 @@
 symbian-armcc {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC
+    QMAKE_LFLAGS += $$QMAKE_LFLAGS.ARMCC
     # This is to prevent inclusion of the shipped RVCT headers, which are often in the
     # environment variable RVCTxxINC by default. -J prevents the searching of that location,
     # but needs a path, so just specify somewhere guaranteed not to contain header files.
@@ -9,6 +10,7 @@ symbian-armcc {
 } else:symbian-gcce {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE
+    QMAKE_LFLAGS += $$QMAKE_LFLAGS.GCCE
 }
 
 # We need a target name without the INFIX'ed part, since flags are not infixed.
diff --git a/mkspecs/symbian-armcc/qmake.conf b/mkspecs/symbian-armcc/qmake.conf
index 77a1966..2de3218 100644
--- a/mkspecs/symbian-armcc/qmake.conf
+++ b/mkspecs/symbian-armcc/qmake.conf
@@ -12,7 +12,7 @@ QMAKE_RVCT_LINKSTYLE = 1
 
 #QMAKE_qtmain_CXXFLAGS	= --arm
 #QMAKE_QtCore_CXXFLAGS	= 
-QMAKE_QtGui_LFLAGS	= "--rw-base 0x800000"
+#QMAKE_QtGui_LFLAGS	= "--rw-base 0x800000"
 #QMAKE_QtDBus_CXXFLAGS	= 
 #QMAKE_QtDeclarative_CXXFLAGS	= 
 #QMAKE_QtMultimedia_CXXFLAGS	= 
@@ -27,9 +27,9 @@ QMAKE_QtGui_LFLAGS	= "--rw-base 0x800000"
 #QMAKE_QtTest_CXXFLAGS	= 
 #QMAKE_QtXmlPatterns_CXXFLAGS	= 
 #QMAKE_QtXml_CXXFLAGS	= 
-QMAKE_QtWebKit_CXXFLAGS	=  --arm
+#QMAKE_QtWebKit_CXXFLAGS	=  --arm
 # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
-QMAKE_QtWebKit_LFLAGS	=  --rw-base 0xE00000
+#QMAKE_QtWebKit_LFLAGS	=  --rw-base 0xE00000
 
 QMAKE_CFLAGS		+= --dllimport_runtime --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter
 QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf
index 62a079b..38042e9 100644
--- a/mkspecs/symbian-gcce/qmake.conf
+++ b/mkspecs/symbian-gcce/qmake.conf
@@ -19,7 +19,7 @@ QMAKE_AR		= arm-none-symbianelf-ar cqs
 
 QMAKE_qtmain_CXXFLAGS	= -mthumb
 QMAKE_QtCore_CXXFLAGS	= -mthumb
-QMAKE_QtGui_LFLAGS	= -Ttext 0x8000 -Tdata 0xE00000
+#QMAKE_QtGui_LFLAGS	= -Ttext 0x8000 -Tdata 0xE00000
 QMAKE_QtDBus_CXXFLAGS	= -mthumb
 QMAKE_QtDeclarative_CXXFLAGS	= -mthumb
 QMAKE_QtMultimedia_CXXFLAGS	= -mthumb
@@ -34,8 +34,7 @@ QMAKE_QtSvg_CXXFLAGS	= -mthumb
 QMAKE_QtTest_CXXFLAGS	= -mthumb
 QMAKE_QtXmlPatterns_CXXFLAGS	= -mthumb
 QMAKE_QtXml_CXXFLAGS	= -mthumb
-#TODO fails with; arm-none-symbianelf-ld: section .data loaded at [00e00000,00e05973] overlaps section .text loaded at [00008000,00fe748b]
-QMAKE_QtWebKit_LFLAGS	= -Ttext 0x8000 -Tdata 0xE00000
+#QMAKE_QtWebKit_LFLAGS	= -Ttext 0x8000 -Tdata 0xE00000
 
 # never use -fPIC, gcce-linker doesn't like it.
 # g++ conf above adds it if the host platform is 64 bit, so we remove it again
@@ -58,7 +57,7 @@ QMAKE_LFLAGS_PLUGIN     += $$QMAKE_LFLAGS_SHLIB
 
 gcceExtraFlags = --include=$${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script
 QMAKE_CFLAGS += $${gcceExtraFlags}
-QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time -fvisibility-inlines-hidden -Os
 #If we are not going to link to Qt or qtmain.lib, we need to include this at least once.
 isEmpty(QT):contains(TEMPLATE, app) {
     QMAKE_CXXFLAGS += --include=$${EPOCROOT}epoc32/include/stdapis/staticlibinit_gcce.h