diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:30:05 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:30:05 (GMT) |
| commit | 13f703741dee67adc7d92e4bcf525431334c9a60 (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/qt3support/widgets/q3popupmenu.cpp | |
| parent | a29ede629a18f9e107bae5e9ca03059a66f25de5 (diff) | |
| parent | bff689f3c5b127add96c50e4b2fdb2eadbf498a9 (diff) | |
| download | Qt-13f703741dee67adc7d92e4bcf525431334c9a60.zip Qt-13f703741dee67adc7d92e4bcf525431334c9a60.tar.gz Qt-13f703741dee67adc7d92e4bcf525431334c9a60.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/qt3support/widgets/q3popupmenu.cpp')
| -rw-r--r-- | src/qt3support/widgets/q3popupmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/widgets/q3popupmenu.cpp b/src/qt3support/widgets/q3popupmenu.cpp index 7f890b5..0b3a524 100644 --- a/src/qt3support/widgets/q3popupmenu.cpp +++ b/src/qt3support/widgets/q3popupmenu.cpp @@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE \fn int Q3PopupMenu::margin() const \since 4.2 - Returns the with 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. \sa setMargin(), QWidget::getContentsMargins() |