diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-06 22:34:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-06 22:34:51 (GMT) |
| commit | b74fccf11304c7bfec4f31e01f130de06e42027e (patch) | |
| tree | c20181f0e0e2bc0e5ef9a1273cf5b112a9584d60 /doc/src | |
| parent | bf965a3b74a10636a63f72d72ad41e169a9851e3 (diff) | |
| parent | 4697a2b50df7135e1da0917676652bcc12abab2a (diff) | |
| download | Qt-b74fccf11304c7bfec4f31e01f130de06e42027e.zip Qt-b74fccf11304c7bfec4f31e01f130de06e42027e.tar.gz Qt-b74fccf11304c7bfec4f31e01f130de06e42027e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 12 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/drag.qml | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 79fe909..574a187 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -120,11 +120,22 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt \list \o \l Item \o \l Rectangle + \list + \o \l Gradient + \list + \o \l GradientStop + \endlist + \endlist \o \l Image \o \l BorderImage \o \l AnimatedImage \o \l Text \o \l TextInput + \list + \o \l IntValidator + \o \l DoubleValidator + \o \l RegExpValidator + \endlist \o \l TextEdit \endlist @@ -142,6 +153,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt \o \l Loader \o \l Repeater \o \l SystemPalette +\o \l FontLoader \o \l LayoutItem \endlist diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml index 9465efb..79469e3 100644 --- a/doc/src/snippets/declarative/drag.qml +++ b/doc/src/snippets/declarative/drag.qml @@ -9,7 +9,7 @@ Rectangle { MouseArea { anchors.fill: parent drag.target: pic - drag.axis: "XAxis" + drag.axis: Drag.XAxis drag.minimumX: 0 drag.maximumX: blurtest.width-pic.width } |