summaryrefslogtreecommitdiffstats
path: root/src/qt3support/widgets/q3groupbox.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-05-19 15:54:46 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-05-19 15:54:46 (GMT)
commite9dec649afc2e513354c79f6e38ca53b6943cccc (patch)
treec3947491e089a1d1d82148481c80ab4e46a49741 /src/qt3support/widgets/q3groupbox.cpp
parent92b47ba61809de30eed205e7d1eafb1cde1087e1 (diff)
parent90b4f0ca7b9fe21f6c4b39a80f8f9cf98626690a (diff)
downloadQt-e9dec649afc2e513354c79f6e38ca53b6943cccc.zip
Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.gz
Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/qt3support/widgets/q3groupbox.cpp')
-rw-r--r--src/qt3support/widgets/q3groupbox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt3support/widgets/q3groupbox.cpp b/src/qt3support/widgets/q3groupbox.cpp
index 1fa7e7c..e0b609a 100644
--- a/src/qt3support/widgets/q3groupbox.cpp
+++ b/src/qt3support/widgets/q3groupbox.cpp
@@ -382,7 +382,7 @@ int Q3GroupBox::insideSpacing() const
}
/*!
- Sets the the width of the inside margin to \a m pixels.
+ Sets the width of the inside margin to \a m pixels.
\sa insideMargin()
*/
@@ -954,7 +954,7 @@ int Q3GroupBox::frameWidth() const
\fn int Q3GroupBox::margin() const
\since 4.2
- Returns the width of the the margin around the contents of the widget.
+ Returns the width of the margin around the contents of the widget.
This function uses QWidget::getContentsMargins() to get the margin.