[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.6.0+dfsg-2-152-g7d4beba

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit ae507bd29ab3958507d7f645bb76ea5b0cbbc0f4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon May 2 07:22:06 2016 +0000

    Add two patches from stable Qt 5.6 branch to fix another case of  QXcbWindow crashes (LP: #1571158).
    
    * Add two patches from stable Qt 5.6 branch to fix another case of
      QXcbWindow crashes (LP: #1571158).
      - debian/patches/Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
      - debian/patches/QtGui-Don-t-set-a-screen-to-a-child-window.patch
---
 debian/changelog                                   |  4 ++
 ...rash-because-of-NULL-screen-in-QXcbWindow.patch | 44 +++++++++++++++++++
 ...tGui-Don-t-set-a-screen-to-a-child-window.patch | 49 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 4 files changed, 99 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ac2098..cee2be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ qtbase-opensource-src (5.5.1+dfsg-16ubuntu10) UNRELEASED; urgency=medium
 
   * debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
     - Backport from upstream 5.6 (LP: #1557915) (LP: #1559906)
+  * Add two patches from stable Qt 5.6 branch to fix another case of 
+    QXcbWindow crashes (LP: #1571158).
+    - debian/patches/Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
+    - debian/patches/QtGui-Don-t-set-a-screen-to-a-child-window.patch
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 02 May 2016 07:14:37 +0000
 
diff --git a/debian/patches/Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch b/debian/patches/Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
new file mode 100644
index 0000000..45190f0
--- /dev/null
+++ b/debian/patches/Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
@@ -0,0 +1,44 @@
+From eaa3a9d0108cdf692f1686cafefb7b834f0e5af6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16 at wp.pl>
+Date: Fri, 1 Jan 2016 20:02:42 +0100
+Subject: [PATCH] Fix crash because of NULL screen in QXcbWindow
+
+Change-Id: If7bbe3ad1656dadcb098bcd3ece2e7b064eeb44d
+Task-number: QTBUG-50081
+Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
+---
+ src/gui/kernel/qwindow.cpp | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
+index e728d32..83e8777 100644
+--- a/src/gui/kernel/qwindow.cpp
++++ b/src/gui/kernel/qwindow.cpp
+@@ -609,18 +609,16 @@ void QWindow::setParent(QWindow *parent)
+     }
+ 
+     QObject::setParent(parent);
+-    if (parent)
++
++    QPlatformWindow *parentPlatformWindow = parent ? parent->d_func()->platformWindow : Q_NULLPTR;
++
++    if (parentPlatformWindow)
+         d->disconnectFromScreen();
+     else
+         d->connectToScreen(newScreen);
+ 
+-    if (d->platformWindow) {
+-        if (parent && parent->d_func()->platformWindow) {
+-            d->platformWindow->setParent(parent->d_func()->platformWindow);
+-        } else {
+-            d->platformWindow->setParent(0);
+-        }
+-    }
++    if (d->platformWindow)
++        d->platformWindow->setParent(parentPlatformWindow);
+ 
+     d->parentWindow = parent;
+ 
+-- 
+2.7.4
+
diff --git a/debian/patches/QtGui-Don-t-set-a-screen-to-a-child-window.patch b/debian/patches/QtGui-Don-t-set-a-screen-to-a-child-window.patch
new file mode 100644
index 0000000..44c5771
--- /dev/null
+++ b/debian/patches/QtGui-Don-t-set-a-screen-to-a-child-window.patch
@@ -0,0 +1,49 @@
+From f3114120f2d6f81f424ee542635c2711f66b516b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16 at wp.pl>
+Date: Tue, 5 Jan 2016 00:58:50 +0100
+Subject: [PATCH] QtGui: Don't set a screen to a child window
+
+This is a partial revert of eaa3a9d0108cdf692f1686cafefb7b834f0e5af6
+
+Task-number: QTBUG-50081
+Change-Id: Ic3dc4daa90d7a968a4ebf45d3029c99a12985686
+Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
+---
+ src/gui/kernel/qwindow.cpp | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
+index 83e8777..21734f1 100644
+--- a/src/gui/kernel/qwindow.cpp
++++ b/src/gui/kernel/qwindow.cpp
+@@ -609,18 +609,20 @@ void QWindow::setParent(QWindow *parent)
+     }
+ 
+     QObject::setParent(parent);
++    d->parentWindow = parent;
+ 
+-    QPlatformWindow *parentPlatformWindow = parent ? parent->d_func()->platformWindow : Q_NULLPTR;
+-
+-    if (parentPlatformWindow)
++    if (parent)
+         d->disconnectFromScreen();
+     else
+         d->connectToScreen(newScreen);
+ 
+-    if (d->platformWindow)
+-        d->platformWindow->setParent(parentPlatformWindow);
+-
+-    d->parentWindow = parent;
++    if (d->platformWindow) {
++        if (parent && parent->d_func()->platformWindow) {
++            d->platformWindow->setParent(parent->d_func()->platformWindow);
++        } else {
++            d->platformWindow->setParent(0);
++        }
++    }
+ 
+     QGuiApplicationPrivate::updateBlockedStatus(this);
+ }
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 8540156..740d893 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,6 +32,8 @@ dbustray_fixes.diff
 qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
 detect-indicator-application.diff
 Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
+Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
+QtGui-Don-t-set-a-screen-to-a-child-window.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging