diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-07-21 07:10:25 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-07-21 07:15:54 (GMT) |
| commit | 9af3a9d59ace4c1ede928959910d7a8698389088 (patch) | |
| tree | 941019e7a394fa75134f89129adc0c832ff7fe79 /src/opengl/qpixmapdata_symbiangl.cpp | |
| parent | 4e910f7d00dc3a08a2ac8578ecc8e0284b407bb9 (diff) | |
| download | Qt-9af3a9d59ace4c1ede928959910d7a8698389088.zip Qt-9af3a9d59ace4c1ede928959910d7a8698389088.tar.gz Qt-9af3a9d59ace4c1ede928959910d7a8698389088.tar.bz2 | |
Fix compilation on Symbian platforms without SgImage support
Reviewed-by: Laszlo Agocs
Diffstat (limited to 'src/opengl/qpixmapdata_symbiangl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_symbiangl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_symbiangl.cpp b/src/opengl/qpixmapdata_symbiangl.cpp index 372b5ca..73d1c9e 100644 --- a/src/opengl/qpixmapdata_symbiangl.cpp +++ b/src/opengl/qpixmapdata_symbiangl.cpp @@ -136,6 +136,7 @@ QGLPixmapData::QGLPixmapData(PixelType type) QGLPixmapData::~QGLPixmapData() { +#ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE if (m_sgImage) { if (m_texture.id) { QGLSgImageTextureCleanup::cleanupForContext(m_ctx)->remove(m_texture.id); @@ -146,6 +147,7 @@ QGLPixmapData::~QGLPixmapData() delete m_sgImage; m_sgImage = 0; } +#endif delete m_engine; } @@ -662,6 +664,7 @@ static inline bool knownGoodFormat(QImage::Format format) } } +#ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE static inline int symbianPixeFormatBitsPerPixel(TUidPixelFormat pixelFormat) { switch (pixelFormat) { @@ -713,6 +716,7 @@ static inline int symbianPixeFormatBitsPerPixel(TUidPixelFormat pixelFormat) return 32; }; } +#endif void QGLPixmapData::fromNativeType(void* pixmap, NativeType type) { |