summaryrefslogtreecommitdiffstats
path: root/src/gui/egl/qegl_x11.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-12-01 07:36:41 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-12-01 07:36:41 (GMT)
commita305814f8f59f634943d8d5f8d87d2fd49891cb3 (patch)
tree42ed4e6afecbf36af2750e2eeaed87117ab942a6 /src/gui/egl/qegl_x11.cpp
parent6258fc281f5b66b2634b81a2633b117165cea7ef (diff)
parent1337a3e031477aa4d628d01252557dee622629ff (diff)
downloadQt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.zip
Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.gz
Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/gui/egl/qegl_x11.cpp')
-rw-r--r--src/gui/egl/qegl_x11.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index 15cc109..29415ed 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -165,8 +165,10 @@ 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_rounding"))
+ if (QEgl::hasExtension("EGL_NV_post_convert_rounding")) {
+ XFree(chosenVisualInfo);
return visualId;
+ }
int visualRedSize = countBits(chosenVisualInfo->red_mask);
int visualGreenSize = countBits(chosenVisualInfo->green_mask);