diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-30 11:28:39 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-30 11:59:11 (GMT) |
| commit | 2b6cf174153c6a680bac94eb666a131a3aad3891 (patch) | |
| tree | 2b9b8184cbea924a9868b94d87747ce4e052398c /src/opengl/qpixmapdata_gl_p.h | |
| parent | c1759aa657f5f729c96696b819465c70266c21c8 (diff) | |
| download | Qt-2b6cf174153c6a680bac94eb666a131a3aad3891.zip Qt-2b6cf174153c6a680bac94eb666a131a3aad3891.tar.gz Qt-2b6cf174153c6a680bac94eb666a131a3aad3891.tar.bz2 | |
Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine
Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*)
on OpenGL graphics system.
Task-number: QTBUG-15254
Reviewed-by: Laszlo Agocs
Diffstat (limited to 'src/opengl/qpixmapdata_gl_p.h')
| -rw-r--r-- | src/opengl/qpixmapdata_gl_p.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h index bf1a303..3d22ad1 100644 --- a/src/opengl/qpixmapdata_gl_p.h +++ b/src/opengl/qpixmapdata_gl_p.h @@ -61,6 +61,9 @@ #ifdef Q_OS_SYMBIAN #include "private/qvolatileimage_p.h" +#ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE +# include <sgresource/sgimage.h> +#endif #endif QT_BEGIN_NAMESPACE @@ -72,8 +75,7 @@ class QGLPixmapData; #ifdef Q_OS_SYMBIAN class QNativeImageHandleProvider; -#endif - +#else class QGLFramebufferObjectPool { public: @@ -102,7 +104,7 @@ public: private: QGLPixmapData *data; }; - +#endif class Q_OPENGL_EXPORT QGLPixmapData : public QPixmapData { @@ -194,6 +196,9 @@ private: mutable QNativeImageHandleProvider *nativeImageHandleProvider; void *nativeImageHandle; QString nativeImageType; +#ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE + RSgImage *m_sgImage; +#endif #else mutable QImage m_source; #endif @@ -208,9 +213,9 @@ private: mutable bool m_hasFillColor; mutable bool m_hasAlpha; - +#ifndef Q_OS_SYMBIAN mutable QGLPixmapGLPaintDevice m_glDevice; - +#endif friend class QGLPixmapGLPaintDevice; friend class QMeeGoPixmapData; friend class QMeeGoLivePixmapData; |