diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-08 22:31:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-08 22:31:15 (GMT) |
| commit | 0d62d8e14433f1f0feebb7d151e9a397589be35a (patch) | |
| tree | 4e33569d2d4273a1dbf93123f45e8ed815e92a44 /doc | |
| parent | 0f4103703ef772cd4ed357378473f7d416a79899 (diff) | |
| parent | e30d5a56506c4f677d18f9cb867f0bd50615b197 (diff) | |
| download | Qt-0d62d8e14433f1f0feebb7d151e9a397589be35a.zip Qt-0d62d8e14433f1f0feebb7d151e9a397589be35a.tar.gz Qt-0d62d8e14433f1f0feebb7d151e9a397589be35a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/declarative/qmlviewer.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 81a6c96..cfbabf2 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -99,6 +99,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l Connection \o \l Component \o \l Timer +\o \l QtObject \endlist \endtable diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc index 6a107ce..a5cb671 100644 --- a/doc/src/declarative/qmlviewer.qdoc +++ b/doc/src/declarative/qmlviewer.qdoc @@ -84,7 +84,7 @@ To use this from within your QML file, import QmlViewer 1.0 and create a Screen object. This object has a property, orientation, which can be either - Screen.Lanscape or Screen.Portrait and which can be bound to in your + Screen.Landscape or Screen.Portrait and which can be bound to in your application. An example is below: \code |