summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Hautakangas <jani.hautakangas@nokia.com>2011-09-27 20:55:42 (GMT)
committerJani Hautakangas <jani.hautakangas@nokia.com>2011-09-27 21:03:22 (GMT)
commit74d548094307f3f3609890d839d5742296e611da (patch)
tree71380692988a789382f37c128b0c22bc23ed5f48
parent24855ef3983fa5d87b3e3a06fe891a769e670ae5 (diff)
downloadQt-74d548094307f3f3609890d839d5742296e611da.zip
Qt-74d548094307f3f3609890d839d5742296e611da.tar.gz
Qt-74d548094307f3f3609890d839d5742296e611da.tar.bz2
A patch for 'Fix to QtOpenGL crash'
EGL API was used also on non-EGL Symbian platforms which generated compile errors when compiling Qt on those platforms. This patch #ifdefs EGL usage correctly for EGL enabled platforms only. Reviewed-by: TRUSTME
-rw-r--r--src/gui/painting/qgraphicssystemex_symbian.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qgraphicssystemex_symbian.cpp b/src/gui/painting/qgraphicssystemex_symbian.cpp
index 46731d8..32e040f 100644
--- a/src/gui/painting/qgraphicssystemex_symbian.cpp
+++ b/src/gui/painting/qgraphicssystemex_symbian.cpp
@@ -55,8 +55,10 @@ QT_BEGIN_NAMESPACE
static bool bcm2727Initialized = false;
static bool bcm2727 = false;
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
typedef EGLBoolean (*NOK_resource_profiling)(EGLDisplay, EGLint, EGLint*, EGLint, EGLint*);
#define EGL_PROF_TOTAL_MEMORY_NOK 0x3070
+#endif
// Detect if Qt is running on BCM2727 chip.
// BCM2727 is a special case on Symbian because