summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-09-06 11:22:39 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-09-06 11:22:39 (GMT)
commit5cfc65d04858563e53987b224f36ee71356aa73c (patch)
treec930c2ed2163e84c71200bb0e616e74e45ac46ec /doc/src
parentcb80c41e7bced1877312468e7f65e3a561e7d161 (diff)
downloadQt-5cfc65d04858563e53987b224f36ee71356aa73c.zip
Qt-5cfc65d04858563e53987b224f36ee71356aa73c.tar.gz
Qt-5cfc65d04858563e53987b224f36ee71356aa73c.tar.bz2
Doc: Worked on two more elements, replacing an image.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/pics/flipable.gifbin80659 -> 131710 bytes
-rw-r--r--doc/src/declarative/qml-intro.qdoc4
-rw-r--r--doc/src/snippets/declarative/flipable/flipable.qml (renamed from doc/src/snippets/declarative/flipable.qml)0
3 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/pics/flipable.gif b/doc/src/declarative/pics/flipable.gif
index 6386f06..da37b2b 100644
--- a/doc/src/declarative/pics/flipable.gif
+++ b/doc/src/declarative/pics/flipable.gif
Binary files differ
diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 9130be0..d735042 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -58,12 +58,12 @@ would be a property.
The basic syntax of an \l{QML Elements}{element} is
-\code
+\qml
SomeElement {
id: myObject
... some other things here ...
}
-\endcode
+\endqml
Here we are defining a new object. We specify its 'type' first as SomeElement.
Then within matching braces { ... } we specify the various parts of our
diff --git a/doc/src/snippets/declarative/flipable.qml b/doc/src/snippets/declarative/flipable/flipable.qml
index c2ecbbe..c2ecbbe 100644
--- a/doc/src/snippets/declarative/flipable.qml
+++ b/doc/src/snippets/declarative/flipable/flipable.qml