diff options
11 files changed, 52 insertions, 52 deletions
diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc index f246533c4f..e5b300a312 100644 --- a/examples/gui/doc/src/rasterwindow.qdoc +++ b/examples/gui/doc/src/rasterwindow.qdoc @@ -54,7 +54,7 @@ \snippet rasterwindow/rasterwindow.h 1 - We first start by including the the QtGui headers. This means we + We first start by including the QtGui headers. This means we can use all classes in the Qt GUI module. Classes can also be included individually if that is preferred. diff --git a/examples/widgets/doc/src/stickman.qdoc b/examples/widgets/doc/src/stickman.qdoc index 6235d3b2a4..a06755874b 100644 --- a/examples/widgets/doc/src/stickman.qdoc +++ b/examples/widgets/doc/src/stickman.qdoc @@ -33,70 +33,70 @@ machine to implement key frame animations. \image stickman-example.png - + In this example, we will write a small application which animates the joints in a skeleton and projects a stickman figure on top. The stickman can be either "alive" or "dead", and when in the - "alive" state, he can be performing different actions defined by key frame animations. - - Animations are implemented as composite states. Each child state of the animation state - represents a frame in the animation by setting the position of each joint in the stickman's - skeleton to the positions defined for the particular frame. The frames are then bound together + "alive" state, he can be performing different actions defined by key frame animations. + + Animations are implemented as composite states. Each child state of the animation state + represents a frame in the animation by setting the position of each joint in the stickman's + skeleton to the positions defined for the particular frame. The frames are then bound together with animated transitions that trigger on the source state's propertiesAssigned() signal. Thus, the machine will enter the state representing the next frame in the animation immediately after it has finished animating into the previous frame. - + \image stickman-example1.png - - The states for an animation is constructed by reading a custom animation file format and - creating states that assign values to the the "position" properties of each of the nodes in the - skeleton graph. - + + The states for an animation is constructed by reading a custom animation file format and + creating states that assign values to the "position" properties of each of the nodes in the + skeleton graph. + \snippet animation/stickman/lifecycle.cpp 1 - + The states are then bound together with signal transitions that listen to the propertiesAssigned() signal. - + \snippet animation/stickman/lifecycle.cpp 2 - + The last frame state is given a transition to the first one, so that the animation will loop - until it is interrupted when a transition out from the animation state is taken. To get smooth - animations between the different key frames, we set a default animation on the state machine. - This is a parallel animation group which contains animations for all the "position" properties - and will be selected by default when taking any transition that leads into a state that assigns + until it is interrupted when a transition out from the animation state is taken. To get smooth + animations between the different key frames, we set a default animation on the state machine. + This is a parallel animation group which contains animations for all the "position" properties + and will be selected by default when taking any transition that leads into a state that assigns values to these properties. - + \snippet animation/stickman/lifecycle.cpp 3 - - Several such animation states are constructed, and are placed together as children of a top + + Several such animation states are constructed, and are placed together as children of a top level "alive" state which represents the stickman life cycle. Transitions go from the parent - state to the child state to ensure that each of the child states inherit them. - + state to the child state to ensure that each of the child states inherit them. + \image stickman-example2.png - - This saves us the effort of connect every state to every state with identical transitions. The - state machine makes sure that transitions between the key frame animations are also smooth by + + This saves us the effort of connect every state to every state with identical transitions. The + state machine makes sure that transitions between the key frame animations are also smooth by applying the default animation when interrupting one and starting another. - - Finally, there is a transition out from the "alive" state and into the "dead" state. This is - a custom transition type called LightningSrikesTransition which samples every second and - triggers at random (one out of fifty times on average.) - + + Finally, there is a transition out from the "alive" state and into the "dead" state. This is + a custom transition type called LightningSrikesTransition which samples every second and + triggers at random (one out of fifty times on average.) + \snippet animation/stickman/lifecycle.cpp 4 - - When it triggers, the machine will first enter a "lightningBlink" state which uses a timer to - pause for a brief period of time while the background color of the scene is white. This gives us + + When it triggers, the machine will first enter a "lightningBlink" state which uses a timer to + pause for a brief period of time while the background color of the scene is white. This gives us a flash effect when the lightning strikes. - + \snippet animation/stickman/lifecycle.cpp 5 - + We start and stop a QTimer object when entering and exiting the state. Then we transition into the "dead" state when the timer times out. - + \snippet animation/stickman/lifecycle.cpp 0 - - When the machine is in the "dead" state, it will be unresponsive. This is because the "dead" + + When the machine is in the "dead" state, it will be unresponsive. This is because the "dead" state has no transitions leading out. - + \image stickman-example3.png - + */ diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index d818d1154c..1e88a67a90 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -83,7 +83,7 @@ existing signal in that class that is emitted whenever the value of the property changes. - \li A \c REVISION number is optional. If included, it defines the + \li A \c REVISION number is optional. If included, it defines the property and its notifier signal to be used in a particular revision of the API that is exposed to QML. diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc index 32cc22a836..d673ee30e1 100644 --- a/src/tools/qdoc/doc/qdoc-manual.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual.qdoc @@ -7026,7 +7026,7 @@ is created actually contains XML text, but the \e{.ditamap} suffix is used to identify the file as containing a DITA MAP. - The argument is the name of the the file to be created. In the following + The argument is the name of the file to be created. In the following example, the file \e{creator.ditamap} is output: \code \ditamap creator.ditamap diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc index 9b2b5913ba..f6c4ed9cd5 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery-fusion.qdoc @@ -58,7 +58,7 @@ \table 100% \row \li \image fusion-groupbox.png - The The QGroupBox widget provides a group box frame with a title. + The QGroupBox widget provides a group box frame with a title. \li \image fusion-tabwidget.png The QTabWidget class provides a stack of tabbed widgets. \li \image fusion-frame.png diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc index fb1a02e5dc..b584582850 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc @@ -62,7 +62,7 @@ \table 100% \row \li \image gtk-groupbox.png - The The QGroupBox widget provides a group box frame with a title. + The QGroupBox widget provides a group box frame with a title. \li \image gtk-tabwidget.png The QTabWidget class provides a stack of tabbed widgets. \li \image gtk-frame.png diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc index 5db5f17974..9a0ff587a3 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc @@ -62,7 +62,7 @@ \table 100% \row \li \image macintosh-groupbox.png - The The QGroupBox widget provides a group box frame with a title. + The QGroupBox widget provides a group box frame with a title. \li \image macintosh-tabwidget.png The QTabWidget class provides a stack of tabbed widgets. \li \image macintosh-frame.png diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc index 2505d20c3f..7fb7ea00b5 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc @@ -58,7 +58,7 @@ \table 100% \row \li \image windows-groupbox.png - The The QGroupBox widget provides a group box frame with a title. + The QGroupBox widget provides a group box frame with a title. \li \image windows-tabwidget.png The QTabWidget class provides a stack of tabbed widgets. \li \image windows-frame.png diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc index 3e9b89832c..1055f2554b 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc @@ -62,7 +62,7 @@ \table 100% \row \li \image windowsvista-groupbox.png - The The QGroupBox widget provides a group box frame with a title. + The QGroupBox widget provides a group box frame with a title. \li \image windowsvista-tabwidget.png The QTabWidget class provides a stack of tabbed widgets. \li \image windowsvista-frame.png diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc index 4fad7a55bd..629a53ebed 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc @@ -62,7 +62,7 @@ \table 100% \row \li \image windowsxp-groupbox.png - The The QGroupBox widget provides a group box frame with a title. + The QGroupBox widget provides a group box frame with a title. \li \image windowsxp-tabwidget.png The QTabWidget class provides a stack of tabbed widgets. \li \image windowsxp-frame.png diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index 2d9d5bba33..a1074a9064 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -813,7 +813,7 @@ In the case of a checkable QGroupBox, the title includes the check indicator. The indicator is styled using the - the \l{#indicator-sub}{::indicator} subcontrol. The + \l{#indicator-sub}{::indicator} subcontrol. The \l{#spacing-prop}{spacing} property can be used to control the spacing between the text and indicator. |