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

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit e46a0c898248ad7e31b2252ea6e467f0569caa1e
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Apr 13 07:47:11 2016 +0000

    Drop xcb_fix_parent_screen_of_embedded_windows.patch
    
    * Drop xcb_fix_parent_screen_of_embedded_windows.patch:
      - Fixed differently in Qt 5.6.
---
 debian/changelog                                           |  2 ++
 debian/patches/series                                      |  1 -
 .../xcb_fix_parent_screen_of_embedded_windows.patch        | 14 --------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bb91f6..556f5a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
   * Rebase and refresh enable-tests.patch.
   * Rebase qnam-ubuntu-fix6.patch.
   * Mark private symbols.
+  * Drop xcb_fix_parent_screen_of_embedded_windows.patch:
+    - Fixed differently in Qt 5.6.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index fa577dc..01e4d3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,5 +20,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
 fix-duplicate-qnam-finished.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
deleted file mode 100644
index f200583..0000000
--- a/debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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