diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-13 02:50:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-13 02:50:47 (GMT) |
| commit | 0b4cc3fff39f9f5a7b7c0e1cfdc241c70fa475d8 (patch) | |
| tree | 8eb2d5d536e91265c7c7962c519455f931bbe677 | |
| parent | 7e2ecab260b2fd5d00d1274892a6f38e325cf72c (diff) | |
| parent | a39285f6f5c3355d48810851a7215b951f1aaa4c (diff) | |
| download | Qt-0b4cc3fff39f9f5a7b7c0e1cfdc241c70fa475d8.zip Qt-0b4cc3fff39f9f5a7b7c0e1cfdc241c70fa475d8.tar.gz Qt-0b4cc3fff39f9f5a7b7c0e1cfdc241c70fa475d8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation of QEgl with EGL 1.1 and older.
| -rw-r--r-- | src/gui/egl/qegl.cpp | 2 | ||||
| -rw-r--r-- | src/gui/egl/qegl_p.h | 4 | ||||
| -rw-r--r-- | src/gui/egl/qeglproperties.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index 605b1e6..af3b79a 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -259,7 +259,7 @@ EGLConfig QEgl::defaultConfig(int devType, API api, ConfigOptions options) // Add paint engine requirements if (api == OpenVG) { -#ifndef QVG_SCISSOR_CLIP +#if !defined(QVG_SCISSOR_CLIP) && defined(EGL_ALPHA_MASK_SIZE) configAttribs.setValue(EGL_ALPHA_MASK_SIZE, 1); #endif } else { diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index c214e88..aa08934 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -65,6 +65,10 @@ QT_BEGIN_INCLUDE_NAMESPACE #else # include <EGL/egl.h> #endif +#if !defined(EGL_VERSION_1_2) +typedef unsigned int EGLenum; +typedef void *EGLClientBuffer; +#endif #else //types from egltypes.h for compiling stub without EGL headers diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp index 3638de5..eeae06d 100644 --- a/src/gui/egl/qeglproperties.cpp +++ b/src/gui/egl/qeglproperties.cpp @@ -241,8 +241,10 @@ void QEglProperties::setRenderableType(QEgl::API api) // reductions in complexity are possible. bool QEglProperties::reduceConfiguration() { +#ifdef EGL_SWAP_BEHAVIOR if (value(EGL_SWAP_BEHAVIOR) != EGL_DONT_CARE) removeValue(EGL_SWAP_BEHAVIOR); +#endif #ifdef EGL_VG_ALPHA_FORMAT_PRE_BIT // For OpenVG, we sometimes try to create a surface using a pre-multiplied format. If we can't |