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: (28 commits)
  Use numeric virtual keyboard for all number entry modes.
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  ...

1 files changed, 1 insertions, 3 deletions

diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp
index 86176c9..21671a6 100644
--- a/src/opengl/qgl_symbian.cpp
+++ b/src/opengl/qgl_symbian.cpp
@@ -39,11 +39,10 @@
 **
 ****************************************************************************/
 
-
 #include "qgl.h"
 #include <fbs.h>
 #include <private/qt_s60_p.h>
-#include <private/qpixmap_s60_p.h>
+#include <private/qpixmap_raster_symbian_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 #include <private/qgl_p.h>
 #include <private/qpaintengine_opengl_p.h>
@@ -437,7 +436,6 @@ void* QGLPixmapData::toNativeType(NativeType type)
             m_source = QVolatileImage(w, h, QImage::Format_ARGB32_Premultiplied);
         return m_source.duplicateNativeImage();
     }
-
     return 0;
 }