diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
| commit | 7075e291998612a3c0a530bb37a515dd07739e28 (patch) | |
| tree | 4e1992498d82ee3f6f92fd6d42754c92928dd581 /examples/gui/doc/src/rasterwindow.qdoc | |
| parent | 1161a8a62907796ea45b1877bec31e66aeef77f6 (diff) | |
| parent | 3d9a40038f01bc2a3df0027a9be04e7fa3ce3850 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qstyleanimation.cpp
Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
Diffstat (limited to 'examples/gui/doc/src/rasterwindow.qdoc')
| -rw-r--r-- | examples/gui/doc/src/rasterwindow.qdoc | 2 |
1 files changed, 1 insertions, 1 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. |