[SCM] qbs packaging branch, master, updated. debian/1.4.2+dfsg-1-5-gc6ae776

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit c6ae7761b7102d3c4c7517460a41777f53715c03
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 26 16:57:07 2015 +0300

    Backport upstream change that should hopefully fix tests failures.
---
 debian/changelog                          |  2 ++
 debian/patches/dont_throw_exceptions.diff | 32 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 714da1e..1690e6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.4.2+dfsg-2) UNRELEASED; urgency=medium
 
+  * Backport upstream change that should hopefully fix tests failures
+    on most architectures (dont_throw_exceptions.diff).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 25 Aug 2015 16:26:18 +0300
 
diff --git a/debian/patches/dont_throw_exceptions.diff b/debian/patches/dont_throw_exceptions.diff
new file mode 100644
index 0000000..bb9b73c
--- /dev/null
+++ b/debian/patches/dont_throw_exceptions.diff
@@ -0,0 +1,32 @@
+Description: don't throw exceptions from EvaluatorScriptClass
+Origin: upstream, http://code.qt.io/cgit/qt-labs/qbs.git/commit/?id=6bf4836f381ece41
+Bug: https://bugreports.qt.io/browse/QBS-863
+Last-Update: 2015-08-26
+
+--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
++++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
+@@ -373,7 +373,11 @@
+ 
+     for (ValuePtr next = value; next; next = next->next()) {
+         QScriptValue v = data->evaluator->property(next->definingItem(), propertyName);
+-        data->evaluator->handleEvaluationError(next->definingItem(), propertyName, v);
++        ScriptEngine * const se = static_cast<ScriptEngine *>(engine());
++        if (se->hasErrorOrException(v)) {
++            *result = se->lastErrorValue(v);
++            return;
++        }
+         if (v.isUndefined())
+             continue;
+         lst << v;
+@@ -384,10 +388,7 @@
+     quint32 k = 0;
+     for (int i = 0; i < lst.count(); ++i) {
+         const QScriptValue &v = lst.at(i);
+-        if (v.isError()) {
+-            *result = v;
+-            return;
+-        }
++        QBS_ASSERT(!v.isError(), continue);
+         if (v.isArray()) {
+             const quint32 vlen = v.property(QStringLiteral("length")).toInt32();
+             for (quint32 j = 0; j < vlen; ++j)
diff --git a/debian/patches/series b/debian/patches/series
index 7ee370e..d72611b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
 kfreebsd.diff
+dont_throw_exceptions.diff

-- 
qbs packaging