diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:41:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 10:41:55 +0100 |
| commit | e4a72450c72fbc7751fd2a983e275f4fdfec81c3 (patch) | |
| tree | 166a5c8858f33e12057ae8f19ae3b4fb5650b66c | |
| parent | 2353df997fee7ec6b99765762f21c925c33a53ab (diff) | |
| parent | 78cb91f7143ef1e768c6875475fda243094239b4 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ib0586881ba40d46dc3da5ee4ac93447afd119d01
| -rw-r--r-- | src/macextras/qmactoolbar.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macextras/qmactoolbar.mm b/src/macextras/qmactoolbar.mm index c2ceb44..44ea46c 100644 --- a/src/macextras/qmactoolbar.mm +++ b/src/macextras/qmactoolbar.mm @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE more \e items. Each toolbar item has an icon and a text label. The toolbar must be attached to a QWindow using the - \l{QWindow::attachToWindow}{attachToWindow} method in order to be visible. + \l{QMacToolBar::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. |