summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-08-09 10:18:53 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-08-09 10:18:53 (GMT)
commitf45c6c61a0967468b1b80375d8c72db4f4fec438 (patch)
tree4636f10f6b2d3708419e16bdfaf29f4a27b10f11 /doc
parent16b7dcb9f3ac6c11e1697fe4cb82e22442515a62 (diff)
downloadQt-f45c6c61a0967468b1b80375d8c72db4f4fec438.zip
Qt-f45c6c61a0967468b1b80375d8c72db4f4fec438.tar.gz
Qt-f45c6c61a0967468b1b80375d8c72db4f4fec438.tar.bz2
doc: Fixed some qdoc errors.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/qml-examples.qdoc2
-rw-r--r--doc/src/examples/simpletreemodel.qdoc16
-rw-r--r--doc/src/examples/spinboxdelegate.qdoc5
-rw-r--r--doc/src/objectmodel/metaobjects.qdoc3
-rw-r--r--doc/src/objectmodel/properties.qdoc3
-rw-r--r--doc/src/painting-and-printing/paintsystem.qdoc6
-rw-r--r--doc/src/windows-and-dialogs/dialogs.qdoc2
7 files changed, 21 insertions, 16 deletions
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 8d3aa25..0d191c9 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -562,7 +562,7 @@
\example declarative/ui-components/dialcontrol
This example shows how to create a dial-type control. It combines
- \l Image elements with \l Rotation transforms and \l SpringAnimatino behaviors
+ \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors
to produce an interactive speedometer-type dial.
\image qml-dialcontrol-example.png
diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc
index c34f4af..16cf8b7 100644
--- a/doc/src/examples/simpletreemodel.qdoc
+++ b/doc/src/examples/simpletreemodel.qdoc
@@ -36,13 +36,15 @@
\image simpletreemodel-example.png
- Qt's model/view architecture provides a standard way for views to manipulate
- information in a data source, using an abstract model of the data to
- simplify and standardize the way it is accessed. Simple models represent
- data as a table of items, and allow views to access this data via an
- \l{model-view-model.html}{index-based} system. More generally, models can
- be used to represent data in the form of a tree structure by allowing each
- item to act as a parent to a table of child items.
+ Qt's model/view architecture provides a standard way for views to
+ manipulate information in a data source, using an abstract model
+ of the data to simplify and standardize the way it is accessed.
+ Simple models represent data as a table of items, and allow views
+ to access this data via an
+ \l{model-view-programming.html#model-indexes} {index-based}
+ system. More generally, models can be used to represent data in
+ the form of a tree structure by allowing each item to act as a
+ parent to a table of child items.
Before attempting to implement a tree model, it is worth considering whether
the data is supplied by an external source, or whether it is going to be
diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc
index 49e3295..da65831 100644
--- a/doc/src/examples/spinboxdelegate.qdoc
+++ b/doc/src/examples/spinboxdelegate.qdoc
@@ -42,8 +42,9 @@
\image spinboxdelegate-example.png
This concepts behind this example are covered in the
- \l{model-view-delegate.html}{Delegate Classes} chapter of the
- \l{model-view-programming.html}{Model/View Programming} overview.
+ \l{model-view-programming.html#delegate-classes}{Delegate Classes}
+ chapter of the \l{model-view-programming.html}{Model/View
+ Programming} overview.
\section1 SpinBoxDelegate Class Definition
diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc
index dd00c5e..0597cd6 100644
--- a/doc/src/objectmodel/metaobjects.qdoc
+++ b/doc/src/objectmodel/metaobjects.qdoc
@@ -28,8 +28,9 @@
/*!
\page metaobjects.html
\title The Meta-Object System
- \ingroup qt-basic-concepts
\brief An overview of Qt's meta-object system and introspection capabilities.
+
+ \ingroup qt-basic-concepts
\keyword meta-object
\target Meta-Object System
diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index 356aaaf..dca332e 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -28,8 +28,9 @@
/*!
\page properties.html
\title The Property System
- \ingroup qt-basic-concepts
\brief An overview of Qt's property system.
+
+ \ingroup qt-basic-concepts
\target Qt's Property System
Qt provides a sophisticated property system similar to the ones
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index e5eb75d..4c6fd91 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -273,7 +273,7 @@
\previouspage Paint Devices and Backends
\contentspage The Paint System
- \nextpage The Coordinate System
+ \nextpage Coordinate System
\section1 Drawing
@@ -395,7 +395,7 @@
\page paintsystem-images.html
\title Reading and Writing Image Files
- \previouspage The Coordinate System
+ \previouspage Coordinate System
\contentspage The Paint System
\nextpage Styling
@@ -554,5 +554,5 @@
\endtable
For more information about widget styling and appearance, see the
- \l{Styles &amp Style Aware Widgets}.
+ \l{Styles and Style Aware Widgets}.
*/
diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc
index 74df2aa..f6649fd 100644
--- a/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -43,7 +43,7 @@
\ingroup qt-gui-concepts
\brief An overview over dialog windows.
- \previouspage The Application Main Window
+ \previouspage Application Main Window
\contentspage Application Windows and Dialogs
\nextpage Desktop Integration