diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-22 08:38:28 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-22 08:38:28 (GMT) |
| commit | a0da99611734651f8ad4de3090f7ab05c2b2f9c1 (patch) | |
| tree | fe8b387b4de7757e97d2a27e2e1568470a3fca9f /src/opengl | |
| parent | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (diff) | |
| parent | 32763b898ad96cc0906aaf3406325134b849a284 (diff) | |
| download | Qt-a0da99611734651f8ad4de3090f7ab05c2b2f9c1.zip Qt-a0da99611734651f8ad4de3090f7ab05c2b2f9c1.tar.gz Qt-a0da99611734651f8ad4de3090f7ab05c2b2f9c1.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/image/qtiffhandler.cpp
Diffstat (limited to 'src/opengl')
| -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 78e5ee7..a7e33e2 100644 --- a/src/opengl/qpixmapdata_symbiangl.cpp +++ b/src/opengl/qpixmapdata_symbiangl.cpp @@ -142,6 +142,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); @@ -152,6 +153,7 @@ QGLPixmapData::~QGLPixmapData() delete m_sgImage; m_sgImage = 0; } +#endif delete m_engine; } @@ -668,6 +670,7 @@ static inline bool knownGoodFormat(QImage::Format format) } } +#ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE static inline int symbianPixeFormatBitsPerPixel(TUidPixelFormat pixelFormat) { switch (pixelFormat) { @@ -719,6 +722,7 @@ static inline int symbianPixeFormatBitsPerPixel(TUidPixelFormat pixelFormat) return 32; }; } +#endif void QGLPixmapData::fromNativeType(void* pixmap, NativeType type) { |