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: (54 commits)
  Update internal state before emitting configurationChanged() signals.
  Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
  Fixed qmlshadersplugin on windows VC2008 toolchain.
  Reset input context in Symbian when another window is opened.
  KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
  Close context menus during orientation change.
  Have -small-screen enabled in certain examples on Symbian always.
  Update Japanese translations.
  Revert some of "Make QMLViewer startup animation stop after a while"
  Fix for winscw QtGui.def
  Add private method for flushing the pixmap cache.
  QDeclarative: Fix QPerformanceTimer on Symbian
  Fix QTreeWidget autotest cases on Symbian/VGA
  Increase SSL readbuffer 1 -> 16 kB
  Fix pixel metrics for Symbian VGA devices
  Revert "Fix QNetworkConfigurationManager usage outside main thread first"
  Avoid buffer overrun in QMacPixmapData resizing
  Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
  Fix tst_QGraphicsItem::sorting() test case for Symbian
  Fix QHeaderView test case for VGA Symbian devices.
  ...

1 files changed, 1 insertions, 3 deletions

diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp
index 91904d0..86176c9 100644
--- a/src/opengl/qgl_symbian.cpp
+++ b/src/opengl/qgl_symbian.cpp
@@ -183,9 +183,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as
         d->ownsEglContext = true;
         d->eglContext->setApi(QEgl::OpenGL);
 
-        QGraphicsSystemEx *ex = QApplicationPrivate::graphicsSystem()->platformExtension();
-        QSymbianGraphicsSystemEx *symex = static_cast<QSymbianGraphicsSystemEx*>(ex);
-        if (symex && !symex->hasBCM2727()) {
+        if (!QSymbianGraphicsSystemEx::hasBCM2727()) {
             // Most likely we have hw support for multisampling
             // so let's enable it.
             d->glFormat.setSampleBuffers(1);