[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.0+dfsg-4-61-gfdfaff5

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit fdfaff5905a921db6786f0f9231678c23734b432
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Oct 15 10:59:23 2015 +0000

    Refresh enable-tests.patch
---
 debian/patches/enable-tests.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 0a9539a..f4d0d1b 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -16952,7 +16952,7 @@ Index: qtbase-opensource-src-5.4.1/tests/auto/widgets/kernel/qtooltip/tst_qtoolt
 --- qtbase-opensource-src-5.4.1.orig/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
 +++ qtbase-opensource-src-5.4.1/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
 @@ -102,6 +102,7 @@ void tst_QToolTip::task183679()
-     Widget_task183679 widget;
+                           + QLatin1Char(' ') + QLatin1String(QTest::currentDataTag()));
      widget.show();
      QApplication::setActiveWindow(&widget);
 +    QSKIP("Skipping failing test");
@@ -17345,7 +17345,7 @@ Index: qtbase-opensource-src-5.4.1/tests/auto/widgets/widgets/qmenubar/tst_qmenu
  
 @@ -1314,6 +1323,7 @@ void tst_QMenuBar::taskQTBUG11823_crashw
  
- void tst_QMenuBar::closeOnSecondClick() // QTBUG-32807, menu should close on 2nd click.
+ void tst_QMenuBar::closeOnSecondClickAndOpenOnThirdClick() // QTBUG-32807, menu should close on 2nd click.
  {
 +    QSKIP("Skipping failing test");
      QMainWindow mainWindow;
@@ -17457,7 +17457,7 @@ Index: qtbase-opensource-src-5.4.1/tests/auto/corelib/mimetypes/qmimedatabase/qm
 +++ qtbase-opensource-src-5.4.1/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
 @@ -41,6 +41,7 @@
  
- void tst_QMimeDatabase::init()
+ void tst_QMimeDatabase::initTestCaseInternal()
  {
 +    QSKIP("Skipping failing test");
  #ifdef QT_NO_PROCESS

-- 
qtbase packaging