[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.0-3-4-gfe1dbcb

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 8e4ae0cc373ed5a5d11213345c9cd075157be8ea
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 5 22:52:17 2016 +0300

    Add a patch to fix the qqmlapplicationengine test.
---
 debian/changelog                                  |  2 ++
 debian/patches/fix_tst_qqmlapplicationengine.diff | 18 ++++++++++++++++++
 debian/patches/series                             |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2004184..ffd8a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtdeclarative-opensource-src (5.7.0-4) UNRELEASED; urgency=medium
     any sense.
   * Rebase fix_engine_64bits_big_endian.diff and fix-V4-on-big-endian.patch
     on top of the above patch.
+  * Add a patch to make the qqmlapplicationengine test pass when JIT is not
+    available (fix_tst_qqmlapplicationengine.diff, forwarded upstream).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Oct 2016 22:45:29 +0300
 
diff --git a/debian/patches/fix_tst_qqmlapplicationengine.diff b/debian/patches/fix_tst_qqmlapplicationengine.diff
new file mode 100644
index 0000000..ebe75bc
--- /dev/null
+++ b/debian/patches/fix_tst_qqmlapplicationengine.diff
@@ -0,0 +1,18 @@
+Description: make tst_qqmlapplicationengine pass when JIT is not available
+ When the platform does not have JIT, a warning about this is printed
+ into the process stderr, so the test fails.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://codereview.qt-project.org/172606
+Last-Update: 2016-10-05
+
+--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
++++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+@@ -111,7 +111,7 @@
+     test_stderr_target.replace('
', QByteArray("
"));
+ #endif
+     QCOMPARE(test_stdout, QByteArray(""));
+-    QCOMPARE(QString(test_stderr), QString(test_stderr_target));
++    QVERIFY(QString(test_stderr).endsWith(QString(test_stderr_target)));
+     delete testProcess;
+     QDir::setCurrent(srcDir);
+ #else // !QT_NO_PROCESS
diff --git a/debian/patches/series b/debian/patches/series
index 88ba873..2431283 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,9 @@ no_value_without_tag.diff
 fix_engine_64bits_big_endian.diff
 fix-V4-on-big-endian.patch
 
+# Forwarded upstream
+fix_tst_qqmlapplicationengine.diff
+
 # Debian patches
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch

-- 
qtdeclarative packaging