diff options
author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
---|---|---|
committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
commit | 47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743 (patch) | |
tree | e8518206ec161750de9722aee17eb82805cca061 /src/gui/widgets/qtoolbox.cpp | |
parent | 0987e68043e174a2a033b58d065c6069c0cf8a1a (diff) | |
parent | a064fe66f5256c7ded6f3df87f503aa0fb8e341b (diff) | |
download | Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.zip Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.gz Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/widgets/qtoolbox.cpp')
-rw-r--r-- | src/gui/widgets/qtoolbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qtoolbox.cpp b/src/gui/widgets/qtoolbox.cpp index 81935a5..271130a 100644 --- a/src/gui/widgets/qtoolbox.cpp +++ b/src/gui/widgets/qtoolbox.cpp @@ -802,7 +802,7 @@ void QToolBox::itemRemoved(int index) /*! \fn int QToolBox::margin() const - 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. Use QWidget::getContentsMargins() instead. \sa setMargin(), QWidget::getContentsMargins() |