[SCM] qbs packaging branch, master, updated. debian/1.4.2+dfsg-3-3-ge548b16

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit fdceb35504bfef5fc30890f3fa932ee65de4692e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 28 16:29:24 2015 +0300

    Drop dont_throw_exceptions.diff, applied upstream.
---
 debian/changelog                          |  1 +
 debian/patches/dont_throw_exceptions.diff | 32 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2eb9e7f..657470b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.4.3+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop dont_throw_exceptions.diff, applied upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 28 Oct 2015 16:27:50 +0300
 
diff --git a/debian/patches/dont_throw_exceptions.diff b/debian/patches/dont_throw_exceptions.diff
deleted file mode 100644
index bb9b73c..0000000
--- a/debian/patches/dont_throw_exceptions.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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 d72611b..7ee370e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
 kfreebsd.diff
-dont_throw_exceptions.diff

-- 
qbs packaging