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
  ...

1 files changed, 3 insertions, 4 deletions

diff --git a/configure b/configure
index 8cf0aac821..835599773d 100755
--- a/configure
+++ b/configure
@@ -641,10 +641,10 @@ CFG_XRANDR=runtime
 CFG_XRENDER=auto
 CFG_MITSHM=auto
 CFG_OPENGL=auto
-CFG_OPENVG=no
+CFG_OPENVG=auto
 CFG_OPENVG_LC_INCLUDES=no
-CFG_OPENVG_SHIVA=no
-CFG_OPENVG_ON_OPENGL=no
+CFG_OPENVG_SHIVA=auto
+CFG_OPENVG_ON_OPENGL=auto
 CFG_EGL=no
 CFG_EGL_GLES_INCLUDES=no
 CFG_SSE=auto
@@ -7120,7 +7120,6 @@ EOF
         canBuildQtConcurrent="no"
 	;;
     symbian-gcce)
-        canBuildWebKit="no"
         canBuildQtConcurrent="no"
         ;;
     symbian-armcc)