diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-23 23:00:11 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-23 23:00:11 (GMT) |
| commit | 981d8f6c95e9c7a21c800ce20e63221b89a20ed1 (patch) | |
| tree | 0f4e69bd152dcf9279057b3528bcf5b3e0102b98 | |
| parent | 8f30d6f474f3d250cb30cb8a68d2c2e24150319e (diff) | |
| parent | be99c17beae01fbc0eabe6f0cfa4b09ebbaa9dbb (diff) | |
| download | Qt-981d8f6c95e9c7a21c800ce20e63221b89a20ed1.zip Qt-981d8f6c95e9c7a21c800ce20e63221b89a20ed1.tar.gz Qt-981d8f6c95e9c7a21c800ce20e63221b89a20ed1.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
| -rw-r--r-- | src/gui/s60framework/qs60keycapture.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qpixmapdata_symbiangl.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/s60framework/qs60keycapture.cpp b/src/gui/s60framework/qs60keycapture.cpp index 415c3e1..1beefd4 100644 --- a/src/gui/s60framework/qs60keycapture.cpp +++ b/src/gui/s60framework/qs60keycapture.cpp @@ -42,7 +42,7 @@ #include <remconinterfaceselector.h> #include <remconcoreapitarget.h> #include <coemain.h> -#include "qkeymapper_p.h" +#include <private/qkeymapper_p.h> #include "qs60keycapture_p.h" QT_BEGIN_NAMESPACE diff --git a/src/opengl/qpixmapdata_symbiangl.cpp b/src/opengl/qpixmapdata_symbiangl.cpp index 78e5ee7..7811110 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) } } +#if defined(QT_SYMBIAN_SUPPORTS_SGIMAGE) && !defined(QT_NO_EGL) static inline int symbianPixeFormatBitsPerPixel(TUidPixelFormat pixelFormat) { switch (pixelFormat) { @@ -719,7 +722,7 @@ static inline int symbianPixeFormatBitsPerPixel(TUidPixelFormat pixelFormat) return 32; }; } - +#endif void QGLPixmapData::fromNativeType(void* pixmap, NativeType type) { if (type == QPixmapData::SgImage && pixmap) { |