diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 03:06:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 03:06:47 (GMT) |
| commit | f74029e286e97067ac39086955481bf979af69dc (patch) | |
| tree | ba6b9706b47624cb4dcd51a3fb4236ce4dddd5b3 /src/gui/widgets/qtoolbar.cpp | |
| parent | 4a5e8e026bed24d451e2d36f490f42a17ed74b47 (diff) | |
| parent | ec0f388dfb14712a144d534296b33df7e6a2df7f (diff) | |
| download | Qt-f74029e286e97067ac39086955481bf979af69dc.zip Qt-f74029e286e97067ac39086955481bf979af69dc.tar.gz Qt-f74029e286e97067ac39086955481bf979af69dc.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (104 commits)
Documentation: clarified RVCT support for Symbian
Update Symbian OS def files for 4.6.2
Remove the installer from the Qt sources.
Don't remove all dependencies when patching the pkg.
Fixes qabstractslider autotest
Workaround for abld toolchain issue with s60main
Add a recursive rule for running the auto-tests.
Do not run the tests automatically during install.
Enabling runfast mode when vfpv2 used.
Fixing a test case to be runnable on Symbian device.
[CRASH] audioinput and audiooutput examples crash when no devices are
Fixed casual crash in initializeDb (Symbian)
Fixes scrolling horizontally with a mouse wheel over sliders.
don't use QKeySequence::mnemonic() after all
Fixed qt_x11_wait_for_window_manager
Revert change 34f1758 on non-Synbian platforms
Fixed QGifHandler::loopCount().
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
don't use stylesheet for just making labels bold
...
Diffstat (limited to 'src/gui/widgets/qtoolbar.cpp')
| -rw-r--r-- | src/gui/widgets/qtoolbar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp index 7782448..7ed27ea 100644 --- a/src/gui/widgets/qtoolbar.cpp +++ b/src/gui/widgets/qtoolbar.cpp @@ -441,8 +441,7 @@ void QToolBarPrivate::plug(const QRect &r) When a QToolBar is not a child of a QMainWindow, it looses the ability to populate the extension pop up with widgets added to the toolbar using addWidget(). Please use widget actions created by inheriting QWidgetAction - and implementing QWidgetAction::createWidget() instead. This is a known - issue which will be fixed in a future release. + and implementing QWidgetAction::createWidget() instead. \sa QToolButton, QMenu, QAction, {Application Example} */ |