[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=c2dbb9d

The following commit has been merged in the ubuntu branch:
commit c2dbb9d78fb92f865a07912784178e68ffe0b47b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Aug 31 11:35:51 2016 +0000

    Adjust tests enablement patch for Qt 5.7.
---
 debian/changelog                  |  1 +
 debian/patches/enable-tests.patch | 24 ++++++++++++------------
 debian/patches/series             |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ead06ea..7d98fd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.7.0+dfsg-3ubuntu1) UNRELEASED; urgency=medium
     - dbustray_use_separate_connections.diff
     - qplatformmenubar_createmenu.diff
   * Update symbols and mark private ones.
+  * Adjust tests enablement patch for Qt 5.7.
 
  -- 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 9867317..feafb2b 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -9,7 +9,7 @@ Index: qtbase-opensource-src-5.6.0-rc/qtbase.pro
 +QT_BUILD_PARTS+=tests
  load(qt_parts)
  
- SUBDIRS += qmake/qmake-docs.pro
+ SUBDIRS += qmake/qmake-aux.pro
 Index: qtbase-opensource-src-5.6.0-rc/tests/auto/corelib/io/qtextstream/rfc3261.txt
 ===================================================================
 --- /dev/null
@@ -21681,9 +21681,9 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/opengl/qglthreads/tst_qglthread
  void tst_QGLThreads::painterOnGLWidgetInThread()
  {
 +    QSKIP("Skipping failing test");
-     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-         QSKIP("No platformsupport for ThreadedOpenGL");
-     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
+     //QTBUG-46446 tst_qglthreads is unstable on windows 7
+     if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
+         QSKIP("Doesn't work on this platform. QTBUG-46446");
 @@ -725,6 +729,7 @@ void tst_QGLThreads::painterOnGLWidgetIn
  */
  void tst_QGLThreads::painterOnPixmapInThread()
@@ -21697,17 +21697,17 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/opengl/qglthreads/tst_qglthread
  void tst_QGLThreads::painterOnPboInThread()
  {
 +    QSKIP("Skipping failing test");
-     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-         QSKIP("No platformsupport for ThreadedOpenGL");
-     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
+     //QTBUG-46446 tst_qglthreads is unstable on windows 7
+     if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
+         QSKIP("Doesn't work on this platform. QTBUG-46446");
 @@ -773,6 +779,7 @@ void tst_QGLThreads::painterOnPboInThrea
  */
  void tst_QGLThreads::painterOnFboInThread()
  {
 +    QSKIP("Skipping failing test");
-     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-         QSKIP("No platformsupport for ThreadedOpenGL");
-     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
+     //QTBUG-46446 tst_qglthreads is unstable on windows 7
+     if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
+         QSKIP("Doesn't work on this platform. QTBUG-46446");
 Index: qtbase-opensource-src-5.6.0-rc/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
 ===================================================================
 --- qtbase-opensource-src-5.6.0-rc.orig/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -22073,7 +22073,7 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/widgets/itemviews/qtreeview/tst
 +    QSKIP("Skipping failing test");
      QTreeWidget treeWidget;
      treeWidget.setColumnCount(5);
-     new QTreeWidgetItem(&treeWidget, QStringList(QString("1;2;3;4;5").split(";")));
+     new QTreeWidgetItem(&treeWidget, QStringList(QString("1;2;3;4;5").split(QLatin1Char(';'))));
 @@ -4292,6 +4293,7 @@ void tst_QTreeView::testInitialFocus()
      treeWidget.show();
      QTest::qWaitForWindowExposed(&treeWidget);
@@ -22249,7 +22249,7 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/widgets/kernel/qwidget/tst_qwid
 +    QSKIP("Skipping failing test");
      if (m_platform == QStringLiteral("wayland"))
          QSKIP("Wayland: This fails. Figure out why.");
- #if defined(Q_OS_QNX) && !defined(Q_OS_BLACKBERRY)
+ #if defined(Q_OS_QNX)
 @@ -7924,6 +7935,7 @@ void tst_QWidget::doubleRepaint()
  
  void tst_QWidget::resizeInPaintEvent()
diff --git a/debian/patches/series b/debian/patches/series
index ff5f8de..d4605c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,7 @@ armv4.diff
 # Ubuntu specific.
 qt5-qmake-arm-linux-gnueabihf
 Add-workaround-for-GL-on-Android-emulator.patch
-#enable-tests.patch
+enable-tests.patch
 skip-largefile-test-s390x.patch
 net-bearer-nm-disconnect-ap-signals7.patch
 qnam-ubuntu-fix6.patch

-- 
qtbase packaging