summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-13 21:58:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-13 21:58:44 (GMT)
commit4e5dedc7b2729152470827e50ee47d6a5bb6a500 (patch)
tree057d46123539cc3e3541aa1686ba4f1729b574fd /src
parent48592026bc9eb024f304411895c3f233b2296cfa (diff)
parent0193617fe21486561ae55403b80419ad1a9105b2 (diff)
downloadQt-4e5dedc7b2729152470827e50ee47d6a5bb6a500.zip
Qt-4e5dedc7b2729152470827e50ee47d6a5bb6a500.tar.gz
Qt-4e5dedc7b2729152470827e50ee47d6a5bb6a500.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Describe QStackedWidget::removeWidget() more thoroughly. Doc: Resized the window and added a title. Doc: Added a missing example to the list of Graphics View examples. Doc: Clarified why a path matches in the example given.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qstackedwidget.cpp7
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()
*/