diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 18:14:29 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 09:25:06 +0200 |
commit | e5f45d9b57bb0542ec47e5a8a4e57388b6d59d35 (patch) | |
tree | 039622ca4f22c5be93cd491d506fe49427ae9672 /tests/auto/qml/qjsonbinding/data | |
parent | 31c5b237c4f0eb6848c7d2e3ae84232c6f8f6d26 (diff) | |
download | qtdeclarative-api_changes.tar.gz |
Add QJson support to QV8Engineapi_changes
Make QV8Engine perform direct conversion between JavaScript values
and QJson{Value,Object,Array}.
This implementation always makes a deep clone of the
QJson{Object,Array} when converting to JS; it might make sense to add
a lazy conversion scheme for dealing with large objects.
Change-Id: Id0b65891a19515ce22f1e51fa8a28d9f3e595271
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/qml/qjsonbinding/data')
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/array.0.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/array.1.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/array.2.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/array.3.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/array.4.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/empty.json | 0 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/false.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/null.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/number.0.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/number.1.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/object.0.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/object.1.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/object.2.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/object.3.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/object.4.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/string.0.json | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsonbinding/data/true.json | 1 |
17 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsonbinding/data/array.0.json b/tests/auto/qml/qjsonbinding/data/array.0.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/array.0.json @@ -0,0 +1 @@ +[] diff --git a/tests/auto/qml/qjsonbinding/data/array.1.json b/tests/auto/qml/qjsonbinding/data/array.1.json new file mode 100644 index 0000000000..3214bfe58c --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/array.1.json @@ -0,0 +1 @@ +[123] diff --git a/tests/auto/qml/qjsonbinding/data/array.2.json b/tests/auto/qml/qjsonbinding/data/array.2.json new file mode 100644 index 0000000000..7fd87cd054 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/array.2.json @@ -0,0 +1 @@ +[true,false,null,"hello"] diff --git a/tests/auto/qml/qjsonbinding/data/array.3.json b/tests/auto/qml/qjsonbinding/data/array.3.json new file mode 100644 index 0000000000..3b418fce74 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/array.3.json @@ -0,0 +1 @@ +[{"a":42}] diff --git a/tests/auto/qml/qjsonbinding/data/array.4.json b/tests/auto/qml/qjsonbinding/data/array.4.json new file mode 100644 index 0000000000..55e9fdce97 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/array.4.json @@ -0,0 +1 @@ +[[[42]],[]] diff --git a/tests/auto/qml/qjsonbinding/data/empty.json b/tests/auto/qml/qjsonbinding/data/empty.json new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/empty.json diff --git a/tests/auto/qml/qjsonbinding/data/false.json b/tests/auto/qml/qjsonbinding/data/false.json new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/false.json @@ -0,0 +1 @@ +false diff --git a/tests/auto/qml/qjsonbinding/data/null.json b/tests/auto/qml/qjsonbinding/data/null.json new file mode 100644 index 0000000000..19765bd501 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/null.json @@ -0,0 +1 @@ +null diff --git a/tests/auto/qml/qjsonbinding/data/number.0.json b/tests/auto/qml/qjsonbinding/data/number.0.json new file mode 100644 index 0000000000..190a18037c --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/number.0.json @@ -0,0 +1 @@ +123 diff --git a/tests/auto/qml/qjsonbinding/data/number.1.json b/tests/auto/qml/qjsonbinding/data/number.1.json new file mode 100644 index 0000000000..c07e7a1490 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/number.1.json @@ -0,0 +1 @@ +42.35 diff --git a/tests/auto/qml/qjsonbinding/data/object.0.json b/tests/auto/qml/qjsonbinding/data/object.0.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/object.0.json @@ -0,0 +1 @@ +{} diff --git a/tests/auto/qml/qjsonbinding/data/object.1.json b/tests/auto/qml/qjsonbinding/data/object.1.json new file mode 100644 index 0000000000..bde58e7952 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/object.1.json @@ -0,0 +1 @@ +{"foo":123} diff --git a/tests/auto/qml/qjsonbinding/data/object.2.json b/tests/auto/qml/qjsonbinding/data/object.2.json new file mode 100644 index 0000000000..d6f25a1488 --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/object.2.json @@ -0,0 +1 @@ +{"a":true,"b":false,"c":null,"d":"hello"} diff --git a/tests/auto/qml/qjsonbinding/data/object.3.json b/tests/auto/qml/qjsonbinding/data/object.3.json new file mode 100644 index 0000000000..9b7611740f --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/object.3.json @@ -0,0 +1 @@ +{"a":{"b":{"c":42}}} diff --git a/tests/auto/qml/qjsonbinding/data/object.4.json b/tests/auto/qml/qjsonbinding/data/object.4.json new file mode 100644 index 0000000000..377313739d --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/object.4.json @@ -0,0 +1 @@ +{"a":[],"b":[42],"c":{"d":null}} diff --git a/tests/auto/qml/qjsonbinding/data/string.0.json b/tests/auto/qml/qjsonbinding/data/string.0.json new file mode 100644 index 0000000000..3580093b9d --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/string.0.json @@ -0,0 +1 @@ +"hello" diff --git a/tests/auto/qml/qjsonbinding/data/true.json b/tests/auto/qml/qjsonbinding/data/true.json new file mode 100644 index 0000000000..27ba77ddaf --- /dev/null +++ b/tests/auto/qml/qjsonbinding/data/true.json @@ -0,0 +1 @@ +true |