[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu1

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 69fd8901d561215894a20b6d35991bd70bca4af3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Nov 7 13:36:27 2016 +0000

    Adjust tests enablement patch for Qt 5.7 and 5.7.1.
---
 debian/changelog                  |  2 +-
 debian/patches/enable-tests.patch | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4cdc76..ae16e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-6ubuntu1) UNRELEASED; urgency=medium
     - Make-sure-connection-is-not-null-before-using-it.patch
     - xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
   * Update symbols and mark private ones.
-  * Adjust tests enablement patch for Qt 5.7.
+  * Adjust tests enablement patch for Qt 5.7 and 5.7.1.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 25 Aug 2016 11:01:48 +0000
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index d847cde..9c2b7a6 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -1,15 +1,3 @@
-Index: qtbase-opensource-src-5.6.0-rc/qtbase.pro
-===================================================================
---- qtbase-opensource-src-5.6.0-rc.orig/qtbase.pro
-+++ qtbase-opensource-src-5.6.0-rc/qtbase.pro
-@@ -2,6 +2,7 @@
- # Main projectfile
- #####################################################################
- 
-+QT_BUILD_PARTS+=tests
- load(qt_parts)
- 
- SUBDIRS += qmake/qmake-aux.pro
 Index: qtbase-opensource-src-5.6.0-rc/tests/auto/corelib/io/qtextstream/rfc3261.txt
 ===================================================================
 --- /dev/null
@@ -23339,7 +23327,7 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/widgets/dialogs/qfiledialog2/ts
  void tst_QFileDialog2::completionOnLevelAfterRoot()
  {
 +    QSKIP("Skipping failing test in 5.5.0 beta");
-     QNonNativeFileDialog fd;
+     QFileDialog fd;
  #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
      fd.setDirectory("C:/");
 @@ -1227,6 +1229,7 @@ void tst_QFileDialog2::task259105_filter
@@ -23371,7 +23359,7 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/widgets/dialogs/qfiledialog2/ts
  void tst_QFileDialog2::dontShowCompleterOnRoot()
  {
 +    QSKIP("Skipping failing test in 5.5.0 beta");
-     QNonNativeFileDialog fd(0, "TestFileDialog");
+     QFileDialog fd(0, "TestFileDialog");
      fd.setAcceptMode(QFileDialog::AcceptSave);
      fd.show();
 Index: qtbase-opensource-src-5.6.0-rc/tests/auto/other/gestures/tst_gestures.cpp
@@ -23403,7 +23391,7 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/widgets/dialogs/qfiledialog/tst
  void tst_QFiledialog::focus()
  {
 +    QSKIP("Skipping failing test in 5.5.0 beta");
-     QNonNativeFileDialog fd;
+     QFileDialog fd;
      fd.setDirectory(QDir::currentPath());
      fd.show();
 Index: qtbase-opensource-src-5.6.0-rc/tests/auto/other/other.pro

-- 
qtbase packaging