diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 02:05:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 02:05:32 (GMT) |
| commit | 50eefbaad10c217eeff5ac0d4b3581176e88e492 (patch) | |
| tree | b44f91f235cb066ef5dc353955a4e0ab0488cc77 | |
| parent | 82440843435b8bf02391fae1c9df6f081a945a65 (diff) | |
| parent | 69e8769e2a3f44700c24437dc851ea817c16318f (diff) | |
| download | Qt-50eefbaad10c217eeff5ac0d4b3581176e88e492.zip Qt-50eefbaad10c217eeff5ac0d4b3581176e88e492.tar.gz Qt-50eefbaad10c217eeff5ac0d4b3581176e88e492.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Take advantage of a new EGL extension when posting 16 bit surfaces.
| -rw-r--r-- | src/gui/egl/qegl_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp index fea6e8d..15cc109 100644 --- a/src/gui/egl/qegl_x11.cpp +++ b/src/gui/egl/qegl_x11.cpp @@ -165,7 +165,7 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config) if (chosenVisualInfo) { // Skip size checks if implementation supports non-matching visual // and config (http://bugreports.qt.nokia.com/browse/QTBUG-9444). - if (QEgl::hasExtension("EGL_NV_post_convert_replication")) + if (QEgl::hasExtension("EGL_NV_post_convert_rounding")) return visualId; int visualRedSize = countBits(chosenVisualInfo->red_mask); |