diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 15:27:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 15:27:13 (GMT) |
| commit | cfac0f3a89bd92955047bf15908a2e7bedd91db0 (patch) | |
| tree | f7352a1d81edff983b1b5d027d985b4e1a0514bd /src/gui/widgets/qdialogbuttonbox.cpp | |
| parent | c2d213becf8f96257789ebeb3ab074733da36424 (diff) | |
| parent | 707610b9f07ad96318e6d84f321588c060c0c294 (diff) | |
| download | Qt-cfac0f3a89bd92955047bf15908a2e7bedd91db0.zip Qt-cfac0f3a89bd92955047bf15908a2e7bedd91db0.tar.gz Qt-cfac0f3a89bd92955047bf15908a2e7bedd91db0.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:
Remove the installer from the Qt sources.
Fixes qabstractslider autotest
Add a recursive rule for running the auto-tests.
Do not run the tests automatically during install.
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
Diffstat (limited to 'src/gui/widgets/qdialogbuttonbox.cpp')
| -rw-r--r-- | src/gui/widgets/qdialogbuttonbox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp index 48d7022..6a0e363 100644 --- a/src/gui/widgets/qdialogbuttonbox.cpp +++ b/src/gui/widgets/qdialogbuttonbox.cpp @@ -1017,6 +1017,8 @@ void QDialogButtonBox::removeButton(QAbstractButton *button) If the button has already been added, it is removed and added again with the new role. + \note The button box takes ownership of the button. + \sa removeButton(), clear() */ void QDialogButtonBox::addButton(QAbstractButton *button, ButtonRole role) |