summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@trolltech.com>2009-05-15 13:20:35 (GMT)
committerGeir Vattekar <geir.vattekar@trolltech.com>2009-05-15 13:20:35 (GMT)
commita830e5f22a42d00b0b92544cfcb56c79b2c3b6cd (patch)
tree4e0683e0a634d4c3a453a2c26ab1ca4c13e586b2 /src
parent85f6350812d5a22c496c66f4f91ea8e36e454561 (diff)
downloadQt-a830e5f22a42d00b0b92544cfcb56c79b2c3b6cd.zip
Qt-a830e5f22a42d00b0b92544cfcb56c79b2c3b6cd.tar.gz
Qt-a830e5f22a42d00b0b92544cfcb56c79b2c3b6cd.tar.bz2
Doc: Updated description of QMainWindow::unifiedTitleAndToolBarOnMac
to include info on Cocoa. Task-number: 252658 Reviewed-by: Trenton Schulz
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qmainwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 502c1e9..558ba42 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1408,10 +1408,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