summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-16 14:21:10 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-16 14:21:10 (GMT)
commitb92dd64af875d62bf4f64097dedaa0b2224304db (patch)
treec2f0c89aff2e0789850ac5b4435e589a48279667 /doc/src
parent386ec93553759b2f15acc8f3f40badae759df0a0 (diff)
downloadQt-b92dd64af875d62bf4f64097dedaa0b2224304db.zip
Qt-b92dd64af875d62bf4f64097dedaa0b2224304db.tar.gz
Qt-b92dd64af875d62bf4f64097dedaa0b2224304db.tar.bz2
doc: Fixed some qdoc errors.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/qmlintro.qdoc1
-rw-r--r--doc/src/declarative/qtprogrammers.qdoc2
-rw-r--r--doc/src/declarative/tutorial1.qdoc2
-rw-r--r--doc/src/development/qtestlib.qdoc2
-rw-r--r--doc/src/examples/editabletreemodel.qdoc2
-rw-r--r--doc/src/qt4-intro.qdoc4
-rw-r--r--doc/src/widgets-and-layouts/stylesheet.qdoc4
7 files changed, 9 insertions, 8 deletions
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index 494c4c7..0a503d7 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -266,6 +266,7 @@ State {
because \c changes is the default property of the \c State type.
\section2 Grouped Properties
+\target dot properties
In some cases properties form a logical group and use a 'dot' or grouped notation
to show this.
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 467a4df..a203662 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -58,7 +58,7 @@ an application with a UI defined in QML also uses Qt for all the non-UI logic.
QML provides direct access to the following concepts from Qt:
\list
- \o QAction - the \l {basicqmlaction}{action} type
+ \o QAction - the \l {QML Basic Types}{action} type
\o QObject signals and slots - available as functions to call in JavaScript
\o QObject properties - available as variables in JavaScript
\o QWidget - QmlView is a QML-displaying widget
diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc
index 5f300e0..b89c74a 100644
--- a/doc/src/declarative/tutorial1.qdoc
+++ b/doc/src/declarative/tutorial1.qdoc
@@ -78,7 +78,7 @@ We add a \l Text element as a child of our root element that will display the te
The \c y property is used to position the text vertically at 30 pixels from the top of its parent.
-The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{Dot Properties}{dot notation}.
+The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
The \c anchors.horizontalCenter property refers to the horizontal center of an element.
In this case, we specify that our text element should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-based Layout}).
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 4b9c657..2b38b2c 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -582,7 +582,7 @@
/*!
\example qtestlib/tutorial3
- \previouspage {Chapter 2 Data Driven Testing}{Chapter 2}
+ \previouspage {Chapter 2: Data Driven Testing}{Chapter 2}
\contentspage {QTestLib Tutorial}{Contents}
\nextpage {Chapter 4: Replaying GUI Events}{Chapter 4}
diff --git a/doc/src/examples/editabletreemodel.qdoc b/doc/src/examples/editabletreemodel.qdoc
index d925c43..38754b6 100644
--- a/doc/src/examples/editabletreemodel.qdoc
+++ b/doc/src/examples/editabletreemodel.qdoc
@@ -223,7 +223,7 @@
corresponding \c TreeItem, and return model indexes that correspond to
its parents and children.
- In the diagram, we show how the model's \l{TreeModel::parent()}{parent()}
+ In the diagram, we show how the model's \l{TreeModel::parent}{parent()}
implementation obtains the model index corresponding to the parent of
an item supplied by the caller, using the items shown in a
\l{Relations-between-internal-items}{previous diagram}.
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 5344bcc..91593d3 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -225,9 +225,9 @@
\row \o \l{Qt3Support} \o Qt 3 support classes
\row \o \l{QAxContainer} \o ActiveQt client extension
\row \o \l{QAxServer} \o ActiveQt server extension
- \row \o \l{QtAssistant} \o Classes for launching Qt Assistant
+ \row \o \l{QtHelp} \o Classes for integrating online documentation
\row \o \l{QtDesigner} \o Classes for extending and embedding Qt Designer
- \row \o \l{QtUiTools} \o Classes for dynamic GUI generation
+ \row \o \l{QtUiTools} \o Classes for dynamic GUI generation
\row \o \l{QtTest} \o Tool classes for unit testing
\endtable
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 5f42f28..4d55066 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -934,8 +934,8 @@
subcontrol.
For items with a sub menu, the arrow marks are styled using the
- \l{::right-arrow-sub}{right-arrow} and
- \l{::left-arrow-sub}{left-arrow}.
+ \l{right-arrow-sub}{right-arrow} and
+ \l{left-arrow-sub}{left-arrow}.
The scroller is styled using the \l{#scroller-sub}{::scroller}.