diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-30 04:30:40 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-30 04:30:40 (GMT) |
commit | 28936246e547234f727a923d2542d92f766fb2e0 (patch) | |
tree | 34393ef0a7afcc95a0ef4cb45ce1b0560f9edd84 /doc/src/declarative | |
parent | d107f39df40990d4cbd1fc5983c5de7ae46bb374 (diff) | |
parent | 7e95bf13d72b28c87dab4b346fd96de6e8a4c046 (diff) | |
download | Qt-28936246e547234f727a923d2542d92f766fb2e0.zip Qt-28936246e547234f727a923d2542d92f766fb2e0.tar.gz Qt-28936246e547234f727a923d2542d92f766fb2e0.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/declarative')
-rw-r--r-- | doc/src/declarative/elements.qdoc | 2 | ||||
-rw-r--r-- | doc/src/declarative/pics/ListViewHorizontal.png | bin | 2519 -> 5802 bytes | |||
-rw-r--r-- | doc/src/declarative/pics/ListViewSections.png | bin | 0 -> 7596 bytes | |||
-rw-r--r-- | doc/src/declarative/pics/trivialListView.png | bin | 2387 -> 6160 bytes |
4 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 8fff472..8955587 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -16,7 +16,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list -\o \l StateGroup +\o \l State \o \l SetProperty \o \l SetProperties \o \l ParentChange diff --git a/doc/src/declarative/pics/ListViewHorizontal.png b/doc/src/declarative/pics/ListViewHorizontal.png Binary files differindex 63c7c86..4633a0e 100644 --- a/doc/src/declarative/pics/ListViewHorizontal.png +++ b/doc/src/declarative/pics/ListViewHorizontal.png diff --git a/doc/src/declarative/pics/ListViewSections.png b/doc/src/declarative/pics/ListViewSections.png Binary files differnew file mode 100644 index 0000000..9270126 --- /dev/null +++ b/doc/src/declarative/pics/ListViewSections.png diff --git a/doc/src/declarative/pics/trivialListView.png b/doc/src/declarative/pics/trivialListView.png Binary files differindex 175e455..3782570 100644 --- a/doc/src/declarative/pics/trivialListView.png +++ b/doc/src/declarative/pics/trivialListView.png |