summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/qml-intro.qdoc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2010-09-10 15:32:54 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2010-09-10 15:32:54 (GMT)
commit99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233 (patch)
treed9807dd8cea5814028b6a67eff4c449f1251b8f5 /doc/src/declarative/qml-intro.qdoc
parentb8644eab5205a9ff20ad27836be2439e7f6a19e9 (diff)
parent66b8d3d82ef213931501baeeabe27c3acc04e947 (diff)
downloadQt-99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233.zip
Qt-99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233.tar.gz
Qt-99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/declarative/qml-intro.qdoc')
-rw-r--r--doc/src/declarative/qml-intro.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 9130be0..b77611c 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
@@ -583,7 +583,7 @@ rectangle. The \c value attribute of 'dial' is set to a value based on the
the rotation of the needle image. Notice this piece of code in Dial where
the change in \c value modifies the position of the needle.
-\snippet examples/declarative/ui-components/dialcontrol/Dial.qml needle angle
+\snippet examples/declarative/ui-components/dialcontrol/content/Dial.qml needle angle
This is part of the \c needleRotation that rotates the needle and causes the
rotation of its shadow. \l SpringAnimation is an element that modifies the value