summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-02 10:04:04 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-02 10:04:04 (GMT)
commitf4f79c42b7086145b59e99d195b6295720b7377a (patch)
tree9b34b9e242062d6833f9d3c9353ca1e252f76a86 /src/gui/widgets
parentc1283842567eea7dd83147a4bea5cd01564fdc2b (diff)
parent353dacb5e4c45e860ae8be228df9647c5a71093e (diff)
downloadQt-f4f79c42b7086145b59e99d195b6295720b7377a.zip
Qt-f4f79c42b7086145b59e99d195b6295720b7377a.tar.gz
Qt-f4f79c42b7086145b59e99d195b6295720b7377a.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qmainwindow.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 0a0faa0..0c841eb 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1419,9 +1419,10 @@ bool QMainWindow::event(QEvent *event)
\i Toolbar breaks are not respected or preserved
\i Any custom widgets in the toolbar will not be shown if the toolbar
becomes too small (only actions will be shown)
- \i If you call showFullScreen() on the main window, the QToolbar will
- disappear since it is considered to be part of the title bar. You can
- work around this by turning off the unified toolbar before you call
+ \i Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would
+ disappear since it is considered to be part of the title bar. Qt 4.5 and up will now work around this by pulling
+ the toolbars out and back into the regular toolbar and vice versa when you swap out.
+ However, a good practice would be that turning off the unified toolbar before you call
showFullScreen() and restoring it after you call showNormal().
\endlist