diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 09:41:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 09:41:38 (GMT) |
| commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
| tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /src/gui/egl/qeglproperties.cpp | |
| parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
| parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) | |
| download | Qt-2271315eb46665b0a9e61ff0525340713163c1b6.zip Qt-2271315eb46665b0a9e61ff0525340713163c1b6.tar.gz Qt-2271315eb46665b0a9e61ff0525340713163c1b6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'src/gui/egl/qeglproperties.cpp')
| -rw-r--r-- | src/gui/egl/qeglproperties.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp index 3638de5..4b8ca9a 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 @@ -258,7 +260,7 @@ bool QEglProperties::reduceConfiguration() // those with smaller (but faster) lower color depths. One // way around this is to set EGL_BUFFER_SIZE to 16, which // trumps the others. Of course, there may not be a 16-bit - // config avaliable, so it's the first restraint we remove. + // config available, so it's the first restraint we remove. if (value(EGL_BUFFER_SIZE) == 16) { removeValue(EGL_BUFFER_SIZE); return true; |