summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-08-09 09:23:35 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-08-09 09:23:35 (GMT)
commit66a6183dc30ca1d572274695707f16b84325b459 (patch)
treeee8265ac6b28d9c536a1c93702d02ffd3a6c790b /doc
parent3e58be3eefbb63c1acf7ecfd1fbbefdf324597ad (diff)
downloadQt-66a6183dc30ca1d572274695707f16b84325b459.zip
Qt-66a6183dc30ca1d572274695707f16b84325b459.tar.gz
Qt-66a6183dc30ca1d572274695707f16b84325b459.tar.bz2
doc: Fixed some qdoc errors.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/widgets-and-layouts/layout.qdoc4
-rw-r--r--doc/src/widgets-and-layouts/styles.qdoc2
-rw-r--r--doc/src/widgets-and-layouts/stylesheet.qdoc2
-rw-r--r--doc/src/widgets-and-layouts/widgets.qdoc2
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index 798a7a1..d2687ea 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -37,9 +37,9 @@
\brief A tour of the standard layout managers and an introduction to custom
layouts.
- \previouspage Widget Classes
+ \previouspage Widgets and Layouts
\contentspage Widgets and Layouts
- \nextpage {Implementing Styles and Style Aware Widgets}{Styles}
+ \nextpage {Styles and Style Aware Widgets}{Styles}
\ingroup frameworks-technologies
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index eab7014..180260b 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -33,7 +33,7 @@
/*!
\page style-reference.html
- \title Styles &amp Style Aware Widgets
+ \title Styles and Style Aware Widgets
\ingroup qt-gui-concepts
\brief Styles and the styling of widgets.
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 1390376..475de3d 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -32,7 +32,7 @@
\ingroup frameworks-technologies
- \previouspage {Implementing Styles and Style Aware Widgets}{Styles}
+ \previouspage {Styles and Style Aware Widgets}{Styles}
\contentspage Widgets and Layouts
\nextpage The Style Sheet Syntax
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index f2475c2..baf3dce 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -68,7 +68,7 @@
\section1 Widget Styles
- \l{Styles &amp Style Aware Widgets}{Styles} draw on behalf of
+ \l{Styles and Style Aware Widgets}{Styles} draw on behalf of
widgets and encapsulate the look and feel of a GUI. Qt's built-in
widgets use the QStyle class to perform nearly all of their drawing,
ensuring that they look exactly like the equivalent native widgets.