diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 07:46:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 07:46:33 (GMT) |
| commit | bd3ce56ec603205ebcb23f449de2872286a8a2d6 (patch) | |
| tree | 75741f821be1d730cf108448772457c2c1a0491d | |
| parent | b8205bd9dc0288f66f1c23e9f227e703bc6712bd (diff) | |
| parent | 9af3a9d59ace4c1ede928959910d7a8698389088 (diff) | |
| download | Qt-bd3ce56ec603205ebcb23f449de2872286a8a2d6.zip Qt-bd3ce56ec603205ebcb23f449de2872286a8a2d6.tar.gz Qt-bd3ce56ec603205ebcb23f449de2872286a8a2d6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix compilation on Symbian platforms without SgImage support
| -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) { |