diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
| commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
| tree | 545dac994ef985cc91d92fa77da21581b6762c86 /src/widgets/widgets/qmenu_mac.mm | |
| parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
| parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/widgets/widgets/qmenu_mac.mm')
| -rw-r--r-- | src/widgets/widgets/qmenu_mac.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm index 29f5913b5d..82379c6509 100644 --- a/src/widgets/widgets/qmenu_mac.mm +++ b/src/widgets/widgets/qmenu_mac.mm @@ -72,7 +72,7 @@ inline QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePla /*! \since 5.2 - Returns the native NSMenu for this menu. Available on OS X only. + Returns the native NSMenu for this menu. Available on \macos only. \note Qt sets the delegate on the native menu. If you need to set your own delegate, make sure you save the original one and forward any calls to it. @@ -93,7 +93,7 @@ NSMenu *QMenu::toNSMenu() \since 5.2 Set this menu to be the dock menu available by option-clicking - on the application dock icon. Available on OS X only. + on the application dock icon. Available on \macos only. */ void QMenu::setAsDockMenu() { @@ -111,7 +111,7 @@ void QMenu::setAsDockMenu() \deprecated Sets this \a menu to be the dock menu available by option-clicking - on the application dock icon. Available on OS X only. + on the application dock icon. Available on \macos only. Deprecated; use \l QMenu::setAsDockMenu() instead. */ @@ -141,7 +141,7 @@ void QMenuPrivate::moveWidgetToPlatformItem(QWidget *widget, QPlatformMenuItem* /*! \since 5.2 - Returns the native NSMenu for this menu bar. Available on OS X only. + Returns the native NSMenu for this menu bar. Available on \macos only. \note Qt may set the delegate on the native menu bar. If you need to set your own delegate, make sure you save the original one and forward any calls to it. |