[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-1-6-g8d094db

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 41ccba84d0982c33a7793ac8bc0269052a57eb21
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jun 10 09:25:56 2011 +0300

    Add Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
---
 debian/changelog                                   |    3 +-
 ...backend_when_creating_translucent_windows.patch |   29 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e3a15f..56f0af6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qt4-x11 (4:4.7.3-2) UNRELEASED; urgency=low
 
-  * 
+  * Add patch cherry-picked upstream:
+    - Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 10 Jun 2011 09:21:12 +0300
 
diff --git a/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch b/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
new file mode 100644
index 0000000..f02a81b
--- /dev/null
+++ b/debian/patches/Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
@@ -0,0 +1,29 @@
+commit 5a834d7141cc7d29d022911ccec16e628d94acf1
+Author: Samuel Rødal <samuel.rodal at nokia.com>
+Date:   Tue May 3 12:36:08 2011 +0200
+
+    Fixed bug in X11 backend when creating translucent windows.
+    
+    We forgot to send the ParentAboutToChange event, which meant QGLWidget
+    didn't destroy the old EGL surface. This could cause two EGL surfaces to
+    be created for the same QGLWidget, which leads to undefined behaviour on
+    some platforms.
+
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -937,8 +937,13 @@ static void qt_x11_recreateWidget(QWidge
+         // recreate their GL context, which in turn causes them to choose
+         // their visual again. Now that WA_TranslucentBackground is set,
+         // QGLContext::chooseVisual will select an ARGB visual.
+-        QEvent e(QEvent::ParentChange);
+-        QApplication::sendEvent(widget, &e);
++
++        // QGLWidget expects a ParentAboutToChange to be sent first
++        QEvent aboutToChangeEvent(QEvent::ParentAboutToChange);
++        QApplication::sendEvent(widget, &aboutToChangeEvent);
++
++        QEvent parentChangeEvent(QEvent::ParentChange);
++        QApplication::sendEvent(widget, &parentChangeEvent);
+     } else {
+         // For regular widgets, reparent them with their parent which
+         // also triggers a recreation of the native window
diff --git a/debian/patches/series b/debian/patches/series
index da3a8fd..f0f903a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ Some_Optimizations_for_the_gray_raster.patch
 Make_use_of_the_fast_image_paths.patch
 Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
 Prevent_recursion_when_creating_window_surface.patch
+Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging