1
=== modified file 'debian/changelog'
2
--- debian/changelog	2014-03-14 07:56:19 +0000
3
+++ debian/changelog	2014-03-14 11:06:48 +0000
4
@@ -1,3 +1,11 @@
5
1
qtdeclarative-opensource-src (5.2.1-3ubuntu10) trusty; urgency=medium
6
2
7
3
  * debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch
8
4
    - Backport from upstream https://codereview.qt-project.org/#change,80934
9
5
      (LP: #1291602)
10
6
11
7
 -- Timo Jyrinki <timo-jyrinki@ubuntu.com>  Fri, 14 Mar 2014 09:37:56 +0000
12
8
13
1
qtdeclarative-opensource-src (5.2.1-3ubuntu9) trusty; urgency=medium
9
qtdeclarative-opensource-src (5.2.1-3ubuntu9) trusty; urgency=medium
14
2
10
15
3
  * debian/patches/clean_chain_of_incubated_objects.patch:
11
  * debian/patches/clean_chain_of_incubated_objects.patch:
16
4
12
17
=== added file 'debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch'
18
--- debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch	1970-01-01 00:00:00 +0000
19
+++ debian/patches/Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch	2014-03-14 11:06:48 +0000
20
@@ -0,0 +1,49 @@
21
1
From 0f771102a59a83a79060e0f200cd6f09ce82ea39 Mon Sep 17 00:00:00 2001
22
2
From: Simon Hausmann <simon.hausmann@digia.com>
23
3
Date: Fri, 14 Mar 2014 10:10:13 +0100
24
4
Subject: [PATCH] Fix crash when appending arrays to sub models in list models
25
5
26
6
The elements are still inaccessible, but at least it doesn't crash. This is
27
7
consistent with the behavior in Qt 5.0, where it didn't crash because the v8
28
8
object handle returned an empty array for the property names because the
29
9
individual array element wasn't an object.
30
10
31
11
Bug QTBUG-12117 tracks support for arrays in list models.
32
12
33
13
Task-number: QTBUG-35891
34
14
Change-Id: Ief446341344977a1473bca474ca5ba934e950468
35
15
---
36
16
 src/qml/types/qqmllistmodel.cpp                    | 3 +++
37
17
 tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp | 2 ++
38
18
 2 files changed, 5 insertions(+)
39
19
40
20
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
41
21
index 37742a3..4a382a1 100644
42
22
--- a/src/qml/types/qqmllistmodel.cpp
43
23
+++ b/src/qml/types/qqmllistmodel.cpp
44
24
@@ -486,6 +486,9 @@ void ListModel::set(int elementIndex, QV4::ObjectRef object, QVector<int> *roles
45
25
 
46
26
 void ListModel::set(int elementIndex, QV4::ObjectRef object, QV8Engine *eng)
47
27
 {
48
28
+    if (!object)
49
29
+        return;
50
30
+
51
31
     ListElement *e = elements[elementIndex];
52
32
 
53
33
     QV4::ExecutionEngine *v4 = object->engine();
54
34
diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
55
35
index bdc0646..787aa0f 100644
56
36
--- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
57
37
+++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
58
38
@@ -528,6 +528,8 @@ void tst_qqmllistmodel::dynamic_data()
59
39
         QTest::newRow("nested-count") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.count}" << 3 << "" << dr;
60
40
         QTest::newRow("nested-clear") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.clear(); get(0).bars.count}" << 0 << "" << dr;
61
41
     }
62
42
+
63
43
+    QTest::newRow("jsarray") << "{append({'foo':['1', '2', '3']});get(0).foo.get(0)}" << 0 << "" << false;
64
44
 }
65
45
 
66
46
 void tst_qqmllistmodel::dynamic()
67
47
-- 
68
48
1.9.0
69
49
70
0
50
71
=== modified file 'debian/patches/series'
72
--- debian/patches/series	2014-03-14 07:55:04 +0000
73
+++ debian/patches/series	2014-03-14 11:06:48 +0000
74
@@ -12,3 +12,4 @@
75
12
aarch64.patch
12
aarch64.patch
76
13
ppc64el.patch
13
ppc64el.patch
77
14
clean_chain_of_incubated_objects.patch
14
clean_chain_of_incubated_objects.patch
78
15
Fix-crash-when-appending-arrays-to-sub-models-in-lis.patch
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-03-15
Kubuntu Packagers		2014-03-14	Pending
Review via email: mp+211025@code.launchpad.net