diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 08:48:16 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 08:48:16 (GMT) |
| commit | cf74ef2ca9163ac6e15b6a218ef284f6104cdcab (patch) | |
| tree | 68fc4ba63a8080917550f8c769c8c4e8f64f45a1 /src/gui/widgets | |
| parent | 3531f4c831407016ef0735d9cdff9b193e4b3f92 (diff) | |
| parent | 862d5433fb694a03715b2327a107b3192b921924 (diff) | |
| download | Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.zip Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.tar.gz Qt-cf74ef2ca9163ac6e15b6a218ef284f6104cdcab.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.1
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qstackedwidget.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/gui/widgets/qstackedwidget.cpp index 396e233..2509a21 100644 --- a/src/gui/widgets/qstackedwidget.cpp +++ b/src/gui/widgets/qstackedwidget.cpp @@ -186,8 +186,11 @@ int QStackedWidget::insertWidget(int index, QWidget *widget) } /*! - Removes the given \a widget from the QStackedWidget. The widget - is \e not deleted. + Removes the given \a widget from the QStackedWidget. + + \bold{Note:} The ownership of \a widget remains the same. + The widget is \e not deleted, but simply removed from the widget's + stacked layout, causing it to be hidden. \sa addWidget(), insertWidget(), currentWidget() */ |