summaryrefslogtreecommitdiffstats
path: root/src/gui/egl
diff options
context:
space:
mode:
authorAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-09-18 12:11:05 (GMT)
committerAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-09-18 12:16:30 (GMT)
commitad32d9a2d2c3b1202867f8563a69afb93effecd0 (patch)
tree371f84075a5c21e664a461ccc3f7db2fc7b320a9 /src/gui/egl
parentdf062a2df4e9a438b6e876801cbd04a7cab7a569 (diff)
downloadQt-ad32d9a2d2c3b1202867f8563a69afb93effecd0.zip
Qt-ad32d9a2d2c3b1202867f8563a69afb93effecd0.tar.gz
Qt-ad32d9a2d2c3b1202867f8563a69afb93effecd0.tar.bz2
Adding support for symbian graphics resources.
This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui/egl')
-rw-r--r--src/gui/egl/qegl_symbian.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/egl/qegl_symbian.cpp b/src/gui/egl/qegl_symbian.cpp
index 3355f0e..fa0b5cb 100644
--- a/src/gui/egl/qegl_symbian.cpp
+++ b/src/gui/egl/qegl_symbian.cpp
@@ -98,6 +98,9 @@ EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
// Set pixel format and other properties based on a paint device.
void QEglProperties::setPaintDeviceFormat(QPaintDevice *dev)
{
+ if(!dev)
+ return;
+
int devType = dev->devType();
if (devType == QInternal::Image)
setPixelFormat(static_cast<QImage *>(dev)->format());