[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.9.0-2-148-g45ca5ef

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit 45ca5ef6955c47595f0614e7db3923cac516823f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jun 23 11:17:29 2017 +0300

    Add testcase_array_iteration.patch which fixes some test hangs.
---
 debian/changelog                              |  4 ++++
 debian/patches/series                         |  1 +
 debian/patches/testcase_array_iteration.patch | 32 +++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4e08d98..a0993e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 qtdeclarative-opensource-src (5.9.0-2ubuntu1) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
   * Merge from Debian Experimental in Git repo. Remaining changes:
     - Keep transitional packages. These (and therefore the delta) can be
       dropped in Ubuntu 18.04 LTS.
@@ -13,6 +14,9 @@ qtdeclarative-opensource-src (5.9.0-2ubuntu1) UNRELEASED; urgency=medium
     - fix_tst_qqmlapplicationengine.diff
     - skip_failing_i386_test.patch
 
+  [ Dmitry Shachnev ]
+  * Add testcase_array_iteration.patch which fixes some test hangs.
+
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Tue, 13 Jun 2017 19:35:17 -0500
 
 qtdeclarative-opensource-src (5.9.0-2) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 418c1bc..85dff52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch
 Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
 big_endian.patch
+testcase_array_iteration.patch
diff --git a/debian/patches/testcase_array_iteration.patch b/debian/patches/testcase_array_iteration.patch
new file mode 100644
index 0000000..da5a383
--- /dev/null
+++ b/debian/patches/testcase_array_iteration.patch
@@ -0,0 +1,32 @@
+Description: fix arrays iteration to work around QTBUG-61579
+Author: Dmitry Shachnev <mitya57 at ubuntu.com>
+Bug: https://bugreports.qt.io/browse/QTBUG-61579
+Forwarded: no
+Last-Update: 2017-06-22
+
+--- a/src/imports/testlib/TestCase.qml
++++ b/src/imports/testlib/TestCase.qml
+@@ -1755,7 +1755,7 @@
+             testList.sort()
+         }
+         var checkNames = (functionsToRun.length > 0)
+-        for (var index in testList) {
++        for (var index = 0; index < testList.length; ++index) {
+             var prop = testList[index]
+             var datafunc = prop + "_data"
+             var isBenchmark = (prop.indexOf("benchmark_") == 0)
+@@ -1775,11 +1775,11 @@
+                     var table = qtest_testCaseResult
+                     var haveData = false
+                     qtest_results.initTestTable()
+-                    for (var index in table) {
++                    for (var rowIndex in table) {
+                         haveData = true
+-                        var row = table[index]
++                        var row = table[parseInt(rowIndex)]
+                         if (!row.tag)
+-                            row.tag = "row " + index    // Must have something
++                            row.tag = "row " + rowIndex    // Must have something
+                         qtest_results.dataTag = row.tag
+                         if (isBenchmark)
+                             qtest_runBenchmarkFunction(prop, row)

-- 
qtdeclarative packaging