diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-10-17 15:57:31 +0100 |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-11-07 15:53:45 +0000 |
| commit | 3342cd1a4003912dfb419dbe4d3babd1f9c30173 (patch) | |
| tree | 84b5f27955c64fa6d035b31c21762cb86e32248c | |
| parent | 080fb267e54cd17697d0a7dbe00449c17d461a11 (diff) | |
| download | qt4-tools-3342cd1a4003912dfb419dbe4d3babd1f9c30173.tar.gz | |
Symbian - fix compile error when default configured
New code assumed building with OpenGL/OpenVG, which is the
production configuration, but not the default configuration
Reviewed-By: Jani Hautakangas
Task-Number: QTBUG-21996
| -rw-r--r-- | src/gui/painting/qgraphicssystemex_symbian.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qgraphicssystemex_symbian.cpp b/src/gui/painting/qgraphicssystemex_symbian.cpp index 32e040fdc8..5a182ffc7f 100644 --- a/src/gui/painting/qgraphicssystemex_symbian.cpp +++ b/src/gui/painting/qgraphicssystemex_symbian.cpp @@ -46,7 +46,7 @@ #include <e32property.h> -#ifdef Q_SYMBIAN_SUPPORTS_SURFACES +#if defined(Q_SYMBIAN_SUPPORTS_SURFACES) && !defined (QT_NO_EGL) #include "private/qegl_p.h" #endif @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE static bool bcm2727Initialized = false; static bool bcm2727 = false; -#ifdef Q_SYMBIAN_SUPPORTS_SURFACES +#if defined(Q_SYMBIAN_SUPPORTS_SURFACES) && !defined (QT_NO_EGL) typedef EGLBoolean (*NOK_resource_profiling)(EGLDisplay, EGLint, EGLint*, EGLint, EGLint*); #define EGL_PROF_TOTAL_MEMORY_NOK 0x3070 #endif @@ -69,7 +69,7 @@ bool QSymbianGraphicsSystemEx::hasBCM2727() if (bcm2727Initialized) return bcm2727; -#ifdef Q_SYMBIAN_SUPPORTS_SURFACES +#if defined(Q_SYMBIAN_SUPPORTS_SURFACES) && !defined (QT_NO_EGL) EGLDisplay display = QEgl::display(); #if 1 // Hacky but fast ~0ms. |