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 | |
| parent | f6bced6b022573bdbe972ee43d17839ebe0b3dcc (diff) | |
| download | Qt-554d74cb9007b6ab7cecbcaf99cba0a068d2b223.zip Qt-554d74cb9007b6ab7cecbcaf99cba0a068d2b223.tar.gz Qt-554d74cb9007b6ab7cecbcaf99cba0a068d2b223.tar.bz2 | |
doc: Fixed some qdoc errors.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/integrating.qdoc | 10 | ||||
| -rw-r--r-- | doc/src/declarative/qmlintro.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/xml-processing/xml-patterns.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/xml-processing/xquery-introduction.qdoc | 2 |
4 files changed, 9 insertions, 7 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 diff --git a/doc/src/xml-processing/xml-patterns.qdoc b/doc/src/xml-processing/xml-patterns.qdoc index 1a9f76d..408b2da 100644 --- a/doc/src/xml-processing/xml-patterns.qdoc +++ b/doc/src/xml-processing/xml-patterns.qdoc @@ -83,7 +83,7 @@ First, the query opens a \c{<bibliography>} element in the output. The - \l{xquery-introduction.html#using-path-expressions-to-match-select-items} + \l{xquery-introduction.html#using-path-expressions-to-match-and-select-items} {embedded path expression} then loads the XML document describing the contents of the library (\c{library.xml}) and begins the search. For each \c{<book>} element it finds, where the publisher diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc index 84e21ab..9306420 100644 --- a/doc/src/xml-processing/xquery-introduction.qdoc +++ b/doc/src/xml-processing/xquery-introduction.qdoc @@ -75,7 +75,7 @@ It creates a new \c{<html>} element in the output and sets its \c{id} attribute to be the \c{id} attribute from an \c{<html>} element in the \c{other.html} file. -\section1 Using Path Expressions To Match & Select Items +\section1 Using Path Expressions To Match And Select Items In C++ and Java, we write nested \c{for} loops and recursive functions to traverse XML trees in search of elements of interest. In XQuery, we |