[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-5-2-g28e0a67

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=28e0a67

The following commit has been merged in the experimental branch:
commit 28e0a6700a96650349bd6ea138bbd26d4a0c0933
Author: Ralf Jung <post at ralfj.de>
Date:   Mon Sep 7 15:07:48 2015 -0300

    Backport upstream patch to fix a windowing issue.
---
 debian/changelog                  |  4 ++++
 debian/patches/screen_crash.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 085f781..8118293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.5.0+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Ralf Jung ]
+  * When a screen comes back online, the windows need to be told
+    about it (screen_crash.diff) (Closes: #787680)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 07 Sep 2015 18:13:16 +0200
 
 qtbase-opensource-src (5.5.0+dfsg-5) experimental; urgency=medium
diff --git a/debian/patches/screen_crash.patch b/debian/patches/screen_crash.patch
new file mode 100644
index 0000000..59b526c
--- /dev/null
+++ b/debian/patches/screen_crash.patch
@@ -0,0 +1,30 @@
+Description: When a screen comes back online, the windows need to be told
+ about it
+Author: Ralf Jung <post at ralfj.de>
+Forwarded: b0b08cc0e4e38504d6b833702f7477aee4e2a192
+Last-Update: 2015-09-07
+
+---
+ src/plugins/platforms/xcb/qxcbconnection.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
++++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
+@@ -252,6 +252,14 @@ void QXcbConnection::updateScreens(const xcb_randr_notify_event_t *event)
+                         otherScreen->addVirtualSibling(screen);
+                 m_screens << screen;
+                 QXcbIntegration::instance()->screenAdded(screen, screen->isPrimary());
++
++                // Windows which had null screens have already had expose events by now.
++                // They need to be told the screen is back, it's OK to render.
++                foreach (QWindow *window, QGuiApplication::topLevelWindows()) {
++                    QXcbWindow *xcbWin = static_cast<QXcbWindow*>(window->handle());
++                    if (xcbWin)
++                        xcbWin->maybeSetScreen(screen);
++                }
+             }
+             // else ignore disabled screens
+         } else if (screen) {
+-- 
+2.4.6
+
diff --git a/debian/patches/series b/debian/patches/series
index 148b172..3d777a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # Backported stuff
 Fix-compile-error-on-big-endian.patch
+screen_crash.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging