diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-18 12:34:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-18 12:34:52 (GMT) |
| commit | 5452a4fef0fcaff59742d53b7876149c39f0b027 (patch) | |
| tree | 00c0f06de646a8356fb1e36cdbaef790712d0b92 | |
| parent | 62a33522fd97782259319c7f02209c0a7b13b201 (diff) | |
| parent | e15d2359aa9f78ae4d6b427531001b907980a595 (diff) | |
| download | Qt-5452a4fef0fcaff59742d53b7876149c39f0b027.zip Qt-5452a4fef0fcaff59742d53b7876149c39f0b027.tar.gz Qt-5452a4fef0fcaff59742d53b7876149c39f0b027.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian - fix compile error when default configured
| -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 32e040f..5a182ff 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. |