[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 89f8363422d6cd3542c8c11331eed22a5e78bb29
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Aug 24 08:42:53 2016 +0000

    debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch:
    
    * debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch:
      - Fix drag and drop from Qt to skype (LP: #1586857)
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 +
 ...so-text-plain-when-a-text-uri-list-is-dro.patch | 53 ++++++++++++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 17a643c..3f01a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
   [ Timo Jyrinki ]
   * debian/patches/QDBusServer-delay-processing-of-D-Bus-messages.patch:
     - Fix DBus message processing (LP: #1608822) 
+  * debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch:
+    - Fix drag and drop from Qt to skype (LP: #1586857)
 
   [ Dmitry Shachnev ]
   * Backport some upstream patches to add support for D-Bus global menus,
diff --git a/debian/patches/series b/debian/patches/series
index 5b7acce..211e803 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 no_dbus_dependency.diff
 color-fonts.patch
 fix-scalable-bitmap-factor-caching.patch
+xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
 QDBusServer-delay-processing-of-D-Bus-messages.patch
 dbustray_use_separate_connections.diff
 dbusmenu_exclusive_groups.diff
diff --git a/debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch b/debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
new file mode 100644
index 0000000..c1001a4
--- /dev/null
+++ b/debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
@@ -0,0 +1,53 @@
+From 3d621af54be7b34e6cc6357b48c4d15f911937ee Mon Sep 17 00:00:00 2001
+From: Urs Fleisch <ufleisch at users.sourceforge.net>
+Date: Sun, 15 May 2016 16:56:40 +0200
+Subject: [PATCH] xcb: Send also "text/plain" when a "text/uri-list" is
+ dropped.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This will allow dropping of files from Qt applications to applications
+like Skype, which only accept "text/plain", but not "text/uri-list" or
+"text/x-moz-url".
+
+Task-number: QTBUG-53238
+Change-Id: I01bca5c8e20647cedfc9323f542ab07f0cc48658
+Reviewed-by: Dmitry Shachnev <mitya57 at gmail.com>
+Reviewed-by: Błażej Szczygieł <spaz16 at wp.pl>
+Reviewed-by: Gatis Paeglis <gatis.paeglis at qt.io>
+---
+ src/plugins/platforms/xcb/qxcbmime.cpp | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
+index 7fea068..cc90da3 100644
+--- a/src/plugins/platforms/xcb/qxcbmime.cpp
++++ b/src/plugins/platforms/xcb/qxcbmime.cpp
+@@ -125,6 +125,11 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa
+         ret = true;
+     } else if ((a == XCB_ATOM_PIXMAP || a == XCB_ATOM_BITMAP) && mimeData->hasImage()) {
+         ret = true;
++    } else if (atomName == QLatin1String("text/plain")
++               && mimeData->hasFormat(QLatin1String("text/uri-list"))) {
++        // Return URLs also as plain text.
++        *data = QInternalMimeData::renderDataHelper(atomName, mimeData);
++        ret = true;
+     }
+     return ret;
+ }
+@@ -143,8 +148,10 @@ QVector<xcb_atom_t> QXcbMime::mimeAtomsForFormat(QXcbConnection *connection, con
+     }
+ 
+     // special cases for uris
+-    if (format == QLatin1String("text/uri-list"))
++    if (format == QLatin1String("text/uri-list")) {
+         atoms.append(connection->internAtom("text/x-moz-url"));
++        atoms.append(connection->internAtom("text/plain"));
++    }
+ 
+     //special cases for images
+     if (format == QLatin1String("image/ppm"))
+-- 
+2.8.1
+

-- 
qtbase packaging