[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=0fba07c

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

    rebase detect indicator patch
---
 debian/patches/detect-indicator-application.diff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/detect-indicator-application.diff b/debian/patches/detect-indicator-application.diff
index 7306de9..0c4739e 100644
--- a/debian/patches/detect-indicator-application.diff
+++ b/debian/patches/detect-indicator-application.diff
@@ -18,7 +18,7 @@ Last-Update: 2016-04-12
 +    Q_CORE_EXPORT static QString processNameByPid(qint64 pid);
  
  #ifdef Q_OS_UNIX
-     static int checkFcntlWorksAfterFlock();
+     static int checkFcntlWorksAfterFlock(const QString &fn);
 --- a/src/platformsupport/dbustray/qdbustrayicon.cpp
 +++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
 @@ -47,13 +47,19 @@

-- 
qtbase packaging