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

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit f094265df3b78364b2002d95b5f7e924f40fde4b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jul 6 05:38:41 2015 +0000

    Make enable-tests.patch apply properly.
---
 debian/patches/enable-tests.patch | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 85688c6..a40eb15 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -17475,27 +17475,6 @@ Index: qtbase-opensource-src-5.4.1/tests/auto/corelib/tools/qsharedpointer/tst_q
  #ifdef Q_CC_MINGW
      QSKIP("The maintainer of QSharedPointer: 'We don't know what the problem is so skip the tests.'");
  #endif
-Index: qtbase-opensource-src-5.4.1/tests/auto/testlib/selftests/tst_selftests.cpp
-===================================================================
---- qtbase-opensource-src-5.4.1.orig/tests/auto/testlib/selftests/tst_selftests.cpp
-+++ qtbase-opensource-src-5.4.1/tests/auto/testlib/selftests/tst_selftests.cpp
-@@ -352,12 +352,14 @@ void tst_Selftests::runSubTest_data()
-         << "benchlibcounting"
-         << "benchlibeventcounter"
-         << "benchliboptions"
--        << "cmptest"
-+        //disable failing test TODO FIXME
-+        //<< "cmptest"
-         << "commandlinedata"
-         << "counting"
-         << "crashes"
-         << "datatable"
--        << "datetime"
-+        //disable failing test TODO FIXME
-+        //<< "datetime"
-         << "differentexec"
- #if !defined(QT_NO_EXCEPTIONS) && !defined(Q_CC_INTEL) && !defined(Q_OS_WIN)
-         // Disable this test on Windows and for intel compiler, as the run-times
 Index: qtbase-opensource-src-5.4.1/tests/auto/tools/qmake/tst_qmake.cpp
 ===================================================================
 --- qtbase-opensource-src-5.4.1.orig/tests/auto/tools/qmake/tst_qmake.cpp
@@ -18367,7 +18346,7 @@ diff -urN qtbase-opensource-src-5.5.0-beta.old/tests/auto/other/other.pro qtbase
 -   toolsupport \
  
  !qtHaveModule(widgets): SUBDIRS -= \
-    baselineexample \
+    gestures \
 diff -urN qtbase-opensource-src-5.5.0-beta.old/tests/auto/widgets/widgets/widgets.pro qtbase-opensource-src-5.5.0-beta/tests/auto/widgets/widgets/widgets.pro
 --- qtbase-opensource-src-5.5.0-beta.old/tests/auto/widgets/widgets/widgets.pro	2015-05-07 09:55:22.000000000 +0000
 +++ qtbase-opensource-src-5.5.0-beta/tests/auto/widgets/widgets/widgets.pro	2015-06-02 08:52:44.628215998 +0000

-- 
qtbase packaging