diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:50:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:50:58 +0200 |
commit | 80feddafd32fdbf7c641cb897769d791c97a4196 (patch) | |
tree | 736aecb04f33928babb7e3008142caa86709b5c2 | |
parent | d521adcbb748c3eec33b0bc939f8bf59e9a0d960 (diff) | |
parent | 9af049f15178ab1b3237b6068397aa4207f2a14e (diff) |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I409a2a711361d3ccb7ffcecf5bfb1820afa64338
-rw-r--r-- | src/macextras/qmactoolbar.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/macextras/qmactoolbar.mm b/src/macextras/qmactoolbar.mm index c75c9e8..c2ceb44 100644 --- a/src/macextras/qmactoolbar.mm +++ b/src/macextras/qmactoolbar.mm @@ -72,9 +72,10 @@ QT_BEGIN_NAMESPACE QMacToolBar provides a Qt-based API for NSToolBar. The toolbar displays one or more \e items. Each toolbar item has an icon and a text label. - The toolbar must be attached to a QWindow with \fn attachToWindow in order to be - visible. The toolbar is attached to the native NSWindow and is displayed above - the QWindow. QMacToolBar visibility follows window visibility. + The toolbar must be attached to a QWindow using the + \l{QWindow::attachToWindow}{attachToWindow} method in order to be visible. + The toolbar is attached to the native NSWindow and is displayed above the + QWindow. QMacToolBar visibility follows window visibility. Add items by calling addItem(). The toolbar has a customization menu which is available to the user from the toolbar context menu. Use addAllowedItem() to |