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

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu branch:
commit e31cd1da1791a968d5ffc456edd46aba6c4a1c1c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Apr 12 17:36:36 2016 +0300

    Implement better detection of indicator-application based trays.
    
    Backported from upstream 5.6 branch. Refs LP: #1546328.
---
 debian/changelog                                 |  7 +++
 debian/patches/detect-indicator-application.diff | 63 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 71 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 56d6d01..7d78add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.5.1+dfsg-16ubuntu7) UNRELEASED; urgency=medium
+
+  * Backport upstream change from 5.6 branch to implement better detection
+    of indicator-application based trays. Refs LP: #1546328.
+
+ -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 12 Apr 2016 17:34:39 +0300
+
 qtbase-opensource-src (5.5.1+dfsg-16ubuntu6) xenial; urgency=medium
 
   [ Alberto Mardegan ]
diff --git a/debian/patches/detect-indicator-application.diff b/debian/patches/detect-indicator-application.diff
new file mode 100644
index 0000000..7306de9
--- /dev/null
+++ b/debian/patches/detect-indicator-application.diff
@@ -0,0 +1,63 @@
+Description: dbustray: implement better detection of indicator-application
+ We need to do the icon cache trick all desktops using indicator-application,
+ these are not limited to Unity. For example, the default Xubuntu and Lubuntu
+ desktops use indicator-application too.
+ .
+ Without this, tray icons will be improperly shown on these desktops.
+Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f156c33c2739d84b
+Last-Update: 2016-04-12
+
+--- a/src/corelib/io/qlockfile_p.h
++++ b/src/corelib/io/qlockfile_p.h
+@@ -75,7 +75,8 @@
+     // Returns 
-- 
qtbase packaging