diff options
author | Martin Smith <msmith@trolltech.com> | 2010-02-16 12:47:41 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-02-16 12:47:41 (GMT) |
commit | 554d74cb9007b6ab7cecbcaf99cba0a068d2b223 (patch) | |
tree | 0ce92eb7bb38c2a47a97162d32b8218d021a33df /doc/src/declarative | |
parent | f6bced6b022573bdbe972ee43d17839ebe0b3dcc (diff) | |
download | Qt-554d74cb9007b6ab7cecbcaf99cba0a068d2b223.zip Qt-554d74cb9007b6ab7cecbcaf99cba0a068d2b223.tar.gz Qt-554d74cb9007b6ab7cecbcaf99cba0a068d2b223.tar.bz2 |
doc: Fixed some qdoc errors.
Diffstat (limited to 'doc/src/declarative')
-rw-r--r-- | doc/src/declarative/integrating.qdoc | 10 | ||||
-rw-r--r-- | doc/src/declarative/qmlintro.qdoc | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc index d93a6ff..49e3903 100644 --- a/doc/src/declarative/integrating.qdoc +++ b/doc/src/declarative/integrating.qdoc @@ -68,10 +68,12 @@ elements, and QML is a better choice if your UI is comprised of a large number of simple and dynamic elements. \section1 Adding QML to a QGraphicsView based UI -If you have an existing Graphics View based UI you can create new items in QML, -and use \l{QmlComponent} to create \l{QGraphicsObject}s from the QML files. These -\l{QGraphicsObject}s can then be placed into your \l{QGraphicsScene} using \l{QGraphicsScene::addItem} -or by reparenting them to an item already in the \l{QGraphicsScene}. + +If you have an existing Graphics View based UI you can create new +items in QML, and use \l{QmlComponent} to create \l{QGraphicsObject}s +from the QML files. These \l{QGraphicsObject}s can then be placed into +your \l{QGraphicsScene} using \l{QGraphicsScene::addItem()} or by +reparenting them to an item already in the \l{QGraphicsScene}. Example, for local QML files: diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc index 3891515..954f5a7 100644 --- a/doc/src/declarative/qmlintro.qdoc +++ b/doc/src/declarative/qmlintro.qdoc @@ -168,7 +168,7 @@ Properties begin with a lowercase letter (with the exception of \l{Attached Prop \section2 Property types -QML supports properties of many types (see \l{Common QML Types}). The basic types include int, +QML supports properties of many types (see \l{QML Basic Types}). The basic types include int, real, bool, string, color, and lists. \code |