qt 4.6.0: backport a few patches from git, mainly QGL related

1 files changed, 33 insertions, 0 deletions

diff --git a/recipes/qt4/qt-4.6.0/0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch b/recipes/qt4/qt-4.6.0/0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch
new file mode 100644
index 0000000000..1afcee62dd
--- /dev/null
+++ b/recipes/qt4/qt-4.6.0/0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch
@@ -0,0 +1,33 @@
+From 92e9fcc25c62870c383c8558d576abc509a8c683 Mon Sep 17 00:00:00 2001
+From: Tom Cooksey <thomas.cooksey@nokia.com>
+Date: Fri, 4 Dec 2009 19:42:07 +0100
+Subject: [PATCH 0945/1244] Add EGL_BUFFER_SIZE to QEglProperties::reduceConfiguration()
+
+Reviewed-by: Trustme
+---
+ src/gui/egl/qeglproperties.cpp |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp
+index 2d37edb..4d4410a 100644
+--- a/src/gui/egl/qeglproperties.cpp
++++ b/src/gui/egl/qeglproperties.cpp
+@@ -229,6 +229,15 @@ void QEglProperties::setRenderableType(QEgl::API api)
+ // reductions in complexity are possible.
+ bool QEglProperties::reduceConfiguration()
+ {
++    // EGL chooses configs with the highest color depth over
++    // 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.
++    if (value(EGL_BUFFER_SIZE) == 16) {
++        removeValue(EGL_BUFFER_SIZE);
++        return true;
++    }
+     if (removeValue(EGL_SAMPLE_BUFFERS)) {
+         removeValue(EGL_SAMPLES);
+         return true;
+-- 
+1.6.5
+