diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-01-22 12:42:56 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-01-22 12:42:56 (GMT) |
| commit | 84f826b764acecc0a93fcfd643719f6447b5d47c (patch) | |
| tree | 270eb7426775eb85f97e6dc7837b44021094419d /src/gui/kernel/qwidget.cpp | |
| parent | 564b32499ef520c804eb92bc6aefa4abcea38a00 (diff) | |
| parent | 5236f93d78d0a09f80819d364867793dd73112e9 (diff) | |
| download | Qt-84f826b764acecc0a93fcfd643719f6447b5d47c.zip Qt-84f826b764acecc0a93fcfd643719f6447b5d47c.tar.gz Qt-84f826b764acecc0a93fcfd643719f6447b5d47c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 81a9a80..5fedb31 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -3344,7 +3344,7 @@ QPoint QWidget::pos() const \note Setting the size to \c{QSize(0, 0)} will cause the widget to not appear on screen. This also applies to windows. - \sa pos, geometry, minimumSize, maximumSize, resizeEvent() + \sa pos, geometry, minimumSize, maximumSize, resizeEvent(), adjustSize() */ /*! |