path: root/examples
diff options
Diffstat (limited to 'examples')
6 files changed, 12 insertions, 11 deletions
diff --git a/examples/threads/doc/src/queuedcustomtype.qdoc b/examples/threads/doc/src/queuedcustomtype.qdoc
index ffeb3dd805..40ec2668de 100644
--- a/examples/threads/doc/src/queuedcustomtype.qdoc
+++ b/examples/threads/doc/src/queuedcustomtype.qdoc
@@ -42,8 +42,9 @@
\section1 Overview
- In the \l{Custom Type Sending Example}, we showed how to use a custom type
- with signal-slot communication within the same thread.
+ In the \l{Custom Type Example}, we showed how to integrate custom types with
+ the meta-object system, enabling them to be stored in QVariant objects, written
+ out in debugging information and used in signal-slot communication.
In this example, we create a new value class, \c Block, and register it
with the meta-object system to enable us to send instances of it between
@@ -152,7 +153,7 @@
meta-object system so that it can be used with signal-slot connections
between threads. For ordinary communication involving direct signals and
slots, it is enough to simply declare the type in the way described in the
- \l{Custom Type Sending Example}.
+ \l{Custom Type Example}.
In practice, both the Q_DECLARE_METATYPE() macro and the qRegisterMetaType()
template function can be used to register custom types, but
diff --git a/examples/threads/doc/src/semaphores.qdoc b/examples/threads/doc/src/semaphores.qdoc
index 494ed7592a..e90045f824 100644
--- a/examples/threads/doc/src/semaphores.qdoc
+++ b/examples/threads/doc/src/semaphores.qdoc
@@ -54,7 +54,7 @@
An alternative to using QSemaphore to solve the producer-consumer
problem is to use QWaitCondition and QMutex. This is what the
- \l{threads/waitconditions}{Wait Conditions} example does.
+ \l{Wait Conditions Example} does.
\section1 Global Variables
diff --git a/examples/threads/doc/src/waitconditions.qdoc b/examples/threads/doc/src/waitconditions.qdoc
index 1439824a78..25c9ce88fb 100644
--- a/examples/threads/doc/src/waitconditions.qdoc
+++ b/examples/threads/doc/src/waitconditions.qdoc
@@ -54,7 +54,7 @@
An alternative to using QWaitCondition and QMutex to solve the
producer-consumer problem is to use QSemaphore. This is what the
- \l{threads/semaphores}{Semaphores} example does.
+ \l{Semaphores Example} does.
\section1 Global Variables
diff --git a/examples/tools/doc/src/customtype.qdoc b/examples/tools/doc/src/customtype.qdoc
index 6e6d08fb35..e016933e04 100644
--- a/examples/tools/doc/src/customtype.qdoc
+++ b/examples/tools/doc/src/customtype.qdoc
@@ -132,8 +132,8 @@
\section1 Further Reading
The custom \c Message type can also be used with direct signal-slot
- connections; see the \l{Custom Type Sending Example} for a demonstration
- of this.
+ connections.
To register a custom type for use with queued signals and slots, such as
those used in cross-thread communication, see the
\l{Queued Custom Type Example}.
diff --git a/examples/widgets/doc/src/padnavigator.qdoc b/examples/widgets/doc/src/padnavigator.qdoc
index 55a6b5e4ac..391ef62587 100644
--- a/examples/widgets/doc/src/padnavigator.qdoc
+++ b/examples/widgets/doc/src/padnavigator.qdoc
@@ -32,8 +32,8 @@
\brief Demonstrates how to create animated user interface
The Pad Navigator Example shows how you can use Graphics View together with
- embedded widgets and Qt's \l{State Machine Framework} to create a simple
- but useful, dynamic, animated user interface.
+ embedded widgets and Qt's \l{The State Machine Framework}{state machine
+ framework} to create a simple but useful, dynamic, animated user interface.
\image padnavigator-example.png
diff --git a/examples/widgets/doc/src/wiggly.qdoc b/examples/widgets/doc/src/wiggly.qdoc
index 9430a3ed36..c2b920decd 100644
--- a/examples/widgets/doc/src/wiggly.qdoc
+++ b/examples/widgets/doc/src/wiggly.qdoc
@@ -42,8 +42,8 @@
time has passed, it sends a QTimerEvent to a QObject of our
choice. This makes QBasicTimer a more lightweight alternative to
QTimer. Qt's built-in widgets use it internally, and it is
- provided in Qt's API for highly-optimized applications (e.g.,
- \l{Qt for Embedded Linux} applications).
+ provided in Qt's API for highly-optimized applications (such as
+ embedded applications).
The example consists of two classes: