Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits)
  Fix thread safety regression of QNetworkConfigurationManager
  Fix instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3
  QDeclarativeMouseArea: block context menu events
  ListViews loses items if all visible items are removed.
  Make TextEdit word selection more natural.
  Clear confusion between QMainWindow and QMainWindowLayout.
  Fix for rounded corners bug in QMenu
  Compile
  QWidgetPrivate::setParent_sys might be using null pointer
  Ensure the TextEdit cursor delegate is repositioned on mouse events.
  Don't crash on an invalid replacementStart from an input method.
  Fix incorrect hardware address on systems without getifaddrs()
  Enable multisampling on Symbian if hw supports it
  Fix QtCoreu.def file error
  Introduce platform extension to QGraphicsSystem
  Fix Symbian/WinsCW build break
  Prevent crash in OpenGL engine when scaling images / pixmaps.
  emit QNetWorkAccessManager::finished on QNetworkReply::abort()
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h
index 0f99a31..275f9eb 100644
--- a/src/gui/painting/qgraphicssystem_p.h
+++ b/src/gui/painting/qgraphicssystem_p.h
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
 
 class QPixmapFilter;
 class QBlittable;
+class QGraphicsSystemEx;
 
 class Q_GUI_EXPORT QGraphicsSystem
 {
@@ -77,7 +78,7 @@ public:
     //    to have a graphics system.
     static QPixmapData *createDefaultPixmapData(QPixmapData::PixelType type);
 
-    virtual void releaseCachedResources();
+    virtual QGraphicsSystemEx* platformExtension();
 };
 
 QT_END_NAMESPACE