diff options
| author | axis <qt-info@nokia.com> | 2009-05-18 12:32:20 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-18 12:32:20 (GMT) |
| commit | 42cc5128d68a03aaa27c97d2eb9e3088acbfadc8 (patch) | |
| tree | 1a63a200a1a5733377acc239dcc49d53af12be25 /src/gui/widgets/qmainwindow.cpp | |
| parent | 3d49f6854f35f19866c4076d551228aa63f38e3d (diff) | |
| parent | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (diff) | |
| download | Qt-42cc5128d68a03aaa27c97d2eb9e3088acbfadc8.zip Qt-42cc5128d68a03aaa27c97d2eb9e3088acbfadc8.tar.gz Qt-42cc5128d68a03aaa27c97d2eb9e3088acbfadc8.tar.bz2 | |
Merge branch 'master' into softkeys
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 43bc098..e12b879 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -1455,10 +1455,10 @@ bool QMainWindow::event(QEvent *event) This property is false by default and only has any effect on Mac OS X 10.4 or higher. - If set to true, then the top toolbar area is replaced with a Carbon - HIToolbar and all toolbars in the top toolbar area are moved to that. Any - toolbars added afterwards will also be added to the Carbon HIToolbar. This - means a couple of things. + If set to true, then the top toolbar area is replaced with a Carbon HIToolbar + or a Cocoa NSToolbar (depending on whether Qt was built with Carbon or Cocoa). + All toolbars in the top toolbar area and any toolbars added afterwards are + moved to that. This means a couple of things. \list \i QToolBars in this toolbar area are not movable and you cannot drag other |