From ea7ed6b27301a4834b1bfe0ad4e6e58462647d3e Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 22 Jul 2011 16:51:44 +0200
Subject: Build Qt for Symbian on Mac/gcce again

Fixed a few things for private header and macros.

Reviewed-by: Honglei Zhang
---
 src/gui/s60framework/qs60keycapture.cpp | 2 +-
 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) {
-- 
cgit v0.12