[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=06b883e

The following commit has been merged in the ubuntu branch:
commit 06b883eb334b74d87500ad81dea0cf0ba9d3e50a
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 19 14:23:24 2016 +0000

    Skip a test related to LP: #1603991
---
 debian/changelog                  |  1 +
 debian/patches/enable-tests.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ef9566b..89d3529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu1) UNRELEASED; urgency=medium
     - debian/patches/fix-duplicate-qnam-finished.patch: folded in to the 
       remaining parts of qnam-ubuntu-fix6.patch, half of which were upstreamed 
       in Qt 5.6.1
+  * Skip a test related to LP: #1603991
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index f15c63f..9867317 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23772,3 +23772,14 @@ diff -urN qtbase-opensource-src-5.6.0.old/tests/auto/gui/image/qimagereader/tst_
      QTest::newRow("YCbCr_cmyk.png") << QString("YCbCr_cmyk.png")
                                             << QByteArray("png") << QSize(75, 50)
                                             << QString("");
+diff -urN qtbase-opensource-src-5.6.1.old/tests/auto/corelib/tools/tools.pro qtbase-opensource-src-5.6.1/tests/auto/corelib/tools/tools.pro
+--- qtbase-opensource-src-5.6.1.old/tests/auto/corelib/tools/tools.pro	2016-05-25 15:46:17.000000000 +0000
++++ qtbase-opensource-src-5.6.1/tests/auto/corelib/tools/tools.pro	2016-07-18 14:11:26.773000112 +0000
+@@ -1,6 +1,6 @@
+ TEMPLATE=subdirs
+ SUBDIRS=\
+-    collections \
++    #LP: #1603991 collections \
+     qalgorithms \
+     qarraydata \
+     qarraydata_strictiterators \

-- 
qtbase packaging