Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_crash_when_appending_arrays into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

* debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch
  - Backport from upstream https://codereview.qt-project.org/#change,80934
    (LP: #1291602)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-autolanding/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-autolanding/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-autolanding/6

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/10/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-autolanding/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-autolanding/7

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-autolanding/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-autolanding/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-autolanding/8

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

The failure does not make sense, since it succeded in archive build running the same tests: https://launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/5.2.1-3ubuntu10

Merging manually.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-14 07:56:19 +0000
+++ debian/changelog	2014-03-14 11:06:48 +0000
@@ -1,3 +1,11 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu10) trusty; urgency=medium
+
+  * debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch
+    - Backport from upstream https://codereview.qt-project.org/#change,80934
+      (LP: #1291602)
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 14 Mar 2014 09:37:56 +0000
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu9) trusty; urgency=medium
 
   * debian/patches/clean_chain_of_incubated_objects.patch:

=== added file 'debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch'
--- debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch	2014-03-14 11:06:48 +0000
@@ -0,0 +1,49 @@
+From 0f771102a59a83a79060e0f200cd6f09ce82ea39 Mon Sep 17 00:00:00 2001
+From: Simon Hausmann <[e-mail]>
+Date: Fri, 14 Mar 2014 10:10:13 +0100
+Subject: [PATCH] Fix crash when appending arrays to sub models in list models
+
+The elements are still inaccessible, but at least it doesn't crash. This is
+consistent with the behavior in Qt 5.0, where it didn't crash because the v8
+object handle returned an empty array for the property names because the
+individual array element wasn't an object.
+
+Bug QTBUG-12117 tracks support for arrays in list models.
+
+Task-number: QTBUG-35891
+Change-Id: Ief446341344977a1473bca474ca5ba934e950468
+---
+ src/qml/types/qqmllistmodel.cpp                    | 3 +++
+ tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
+index 37742a3..4a382a1 100644
+--- a/src/qml/types/qqmllistmodel.cpp
++++ b/src/qml/types/qqmllistmodel.cpp
+@@ -486,6 +486,9 @@ void ListModel::set(int elementIndex, QV4::ObjectRef object, QVector<int> *roles
+ 
+ void ListModel::set(int elementIndex, QV4::ObjectRef object, QV8Engine *eng)
+ {
++    if (!object)
++        return;
++
+     ListElement *e = elements[elementIndex];
+ 
+     QV4::ExecutionEngine *v4 = object->engine();
+diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
+index bdc0646..787aa0f 100644
+--- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
++++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
+@@ -528,6 +528,8 @@ void tst_qqmllistmodel::dynamic_data()
+         QTest::newRow("nested-count") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.count}" << 3 << "" << dr;
+         QTest::newRow("nested-clear") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.clear(); get(0).bars.count}" << 0 << "" << dr;
+     }
++
++    QTest::newRow("jsarray") << "{append({'foo':['1', '2', '3']});get(0).foo.get(0)}" << 0 << "" << false;
+ }
+ 
+ void tst_qqmllistmodel::dynamic()
+-- 
+1.9.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-14 07:55:04 +0000
+++ debian/patches/series	2014-03-14 11:06:48 +0000
@@ -12,3 +12,4 @@
 aarch64.patch
 ppc64el.patch
 clean_chain_of_incubated_objects.patch
+Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch