diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-22 15:29:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-22 15:29:21 (GMT) |
| commit | 9a46748375396ab84cd87baf3bdfe683a2803668 (patch) | |
| tree | bffbc23975d239d152a35c1d90c8ca7736aff6a2 /src/gui/kernel/qwidget.cpp | |
| parent | 1e7d6f3c5adb066f00cf50cc39b8646668174091 (diff) | |
| parent | 5ea0be16612625aa75fbd6e519a3cbc7971c65c4 (diff) | |
| download | Qt-9a46748375396ab84cd87baf3bdfe683a2803668.zip Qt-9a46748375396ab84cd87baf3bdfe683a2803668.tar.gz Qt-9a46748375396ab84cd87baf3bdfe683a2803668.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() */ /*! |