From ab12c1c804ee40931515a0d53e5dc70db373f3bd Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
Date: Fri, 5 Mar 2010 11:22:12 +0200
Subject: Fix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes.

QRasterGraphicsSystem tries to create QRasterPixmapData and
QRasterWindowSurface if QApplication::setGraphicsSystem("raster")
is used. On Symbian it should create QS60PixmapData and QS60WindowSurface.

Task-number: QTBUG-8762
Reviewed-by: Jason Barron
---
 src/gui/painting/qgraphicssystem_raster.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/gui/painting/qgraphicssystem_raster.cpp b/src/gui/painting/qgraphicssystem_raster.cpp
index f90aea0..909508e 100644
--- a/src/gui/painting/qgraphicssystem_raster.cpp
+++ b/src/gui/painting/qgraphicssystem_raster.cpp
@@ -41,19 +41,32 @@
 
 #include "qgraphicssystem_raster_p.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "private/qpixmap_s60_p.h"
+#include "private/qwindowsurface_s60_p.h"
+#else
 #include "private/qpixmap_raster_p.h"
 #include "private/qwindowsurface_raster_p.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
 QPixmapData *QRasterGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
 {
+#ifdef Q_OS_SYMBIAN
+    return new QS60PixmapData(type);
+#else
     return new QRasterPixmapData(type);
+#endif
 }
 
 QWindowSurface *QRasterGraphicsSystem::createWindowSurface(QWidget *widget) const
 {
+#ifdef Q_OS_SYMBIAN
+    return new QS60WindowSurface(widget);
+#else
     return new QRasterWindowSurface(widget);
+#endif
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12