[SCM] qtquickcontrols packaging branch, experimental, updated. debian/5.6.1-2-15-gacac010

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit acac010a4088cd06181b765f2f50f14033aa288f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 12 16:38:47 2016 +0300

    Disable one failing test, test_windowHeight2 (skip_failing_test.diff).
---
 debian/changelog                      |  1 +
 debian/patches/series                 |  1 +
 debian/patches/skip_failing_test.diff | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 05bce57..9e80903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ qtquickcontrols-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * Run tests during build.
     - Build with QT_BUILD_PARTS+=tests.
     - Add build-dependencies on various QML modules and Xvfb.
+    - Disable one failing test, test_windowHeight2 (skip_failing_test.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Jun 2016 14:43:47 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 315877e..ea163ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 packaged_dejavu_sans.diff
+skip_failing_test.diff
diff --git a/debian/patches/skip_failing_test.diff b/debian/patches/skip_failing_test.diff
new file mode 100644
index 0000000..2264f0c
--- /dev/null
+++ b/debian/patches/skip_failing_test.diff
@@ -0,0 +1,16 @@
+Description: skip test_windowHeight2() which currently fails
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug-Upstream: https://bugreports.qt.io/browse/QTBUG-54714
+Forwarded: not-needed
+Last-Update: 2016-07-12
+
+--- a/tests/auto/controls/data/tst_applicationwindow.qml
++++ b/tests/auto/controls/data/tst_applicationwindow.qml
+@@ -303,6 +303,7 @@
+     }
+ 
+     function test_windowHeight2() {
++        skip("QTBUG-54714")
+         var test_control = 'import QtQuick 2.2; \
+         import QtQuick 2.2;                     \
+         import QtQuick.Controls 1.2;            \

-- 
qtquickcontrols packaging