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 /src/widgets/doc/src/widgets-and-layouts/gallery-gtk.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 'src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc')
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |