[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-16ubuntu4-1-g580c5a3

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 580c5a3805c2fe844686523b2770b4864b7be3a0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Apr 6 11:32:09 2016 +0000

    debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch:
    
    * debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch:
      - Fix wrong size of embedded window. Fixed in upstream Qt 5.6.
        (LP: #1564767)
---
 debian/changelog                                          | 15 +++++++++++++++
 debian/patches/series                                     |  1 +
 .../xcb_fix_parent_screen_of_embedded_windows.patch       | 14 ++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 15a2925..56d6d01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+qtbase-opensource-src (5.5.1+dfsg-16ubuntu6) xenial; urgency=medium
+
+  [ Alberto Mardegan ]
+  * debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch:
+    - Fix wrong size of embedded window. Fixed in upstream Qt 5.6.
+      (LP: #1564767)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 05 Apr 2016 13:59:17 +0000
+
+qtbase-opensource-src (5.5.1+dfsg-16ubuntu5) xenial; urgency=medium
+
+  * Rebuild against libmysqlclient20.
+
+ -- Robie Basak <robie.basak at ubuntu.com>  Tue, 05 Apr 2016 12:57:34 +0000
+
 qtbase-opensource-src (5.5.1+dfsg-16ubuntu4) xenial; urgency=medium
 
   * debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 8300e07..b6a7701 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ skip-largefile-test-s390x.patch
 net-bearer-nm-disconnect-ap-signals7.patch
 qnam-ubuntu-fix6.patch
 disable_overlay_scrollbars.diff
+xcb_fix_parent_screen_of_embedded_windows.patch
diff --git a/debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch b/debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch
new file mode 100644
index 0000000..f200583
--- /dev/null
+++ b/debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch
@@ -0,0 +1,14 @@
+Index: qtbase-opensource-src-5.5.1+dfsg/src/plugins/platforms/xcb/qxcbwindow.cpp
+===================================================================
+--- qtbase-opensource-src-5.5.1+dfsg.orig/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ qtbase-opensource-src-5.5.1+dfsg/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -174,7 +174,8 @@ static inline QRect mapLocalGeometryFrom
+ 
+ QXcbScreen *QXcbWindow::parentScreen()
+ {
+-    return parent() ? static_cast<QXcbWindow*>(parent())->parentScreen() : m_xcbScreen;
++    return (parent() && parent()->window()->type() != Qt::ForeignWindow) ?
++        static_cast<QXcbWindow*>(parent())->parentScreen() : m_xcbScreen;
+ }
+ 
+ QPoint QXcbWindow::mapToNative(const QPoint &pos, const QXcbScreen *screen) const

-- 
qtbase packaging