summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-04 23:24:58 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-04 23:24:58 (GMT)
commite68a0dafbff345eebb15cf6f1a5d88df37f0269a (patch)
tree2abe372173c3709706dfdcf973de53732661b031
parente24370f2d8d1604175e7426bf69daaf90c5de70c (diff)
parentd22833a287b2eef0278ce59ee206a4e0ba18e8fd (diff)
downloadQt-e68a0dafbff345eebb15cf6f1a5d88df37f0269a.zip
Qt-e68a0dafbff345eebb15cf6f1a5d88df37f0269a.tar.gz
Qt-e68a0dafbff345eebb15cf6f1a5d88df37f0269a.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rwxr-xr-xconfigure.exebin2170880 -> 1204224 bytes
-rw-r--r--tests/auto/declarative/qmlxmllistmodel/data/model2.qml11
2 files changed, 11 insertions, 0 deletions
diff --git a/configure.exe b/configure.exe
index dabf10c..30e881e 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model2.qml b/tests/auto/declarative/qmlxmllistmodel/data/model2.qml
new file mode 100644
index 0000000..140e0ad
--- /dev/null
+++ b/tests/auto/declarative/qmlxmllistmodel/data/model2.qml
@@ -0,0 +1,11 @@
+import Qt 4.6
+
+XmlListModel {
+ source: "model.xml"
+ query: "/Pets/Pet"
+ XmlRole { name: "name"; query: "name/string()" }
+ XmlRole { name: "type"; query: "type/string()" }
+ XmlRole { name: "age"; query: "age/number()" }
+ XmlRole { name: "size"; query: "size/string()" }
+ XmlRole { name: "tricks"; query: "tricks/string()" }
+}