diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-02 10:23:36 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-02 10:23:36 +0100 |
| commit | 715023b490f4cbae7d6b11356f7247979b01ad00 (patch) | |
| tree | f7851e0c366d0b1a43710be13ad2e8d5a4eb2525 /src/imports/platform | |
| parent | 5be4488fb15b544926af203feeffa5ced8184f1f (diff) | |
| parent | 00a7dfd16d4484064bd0e5601720993d0525995a (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/platform/qquickplatformmenuitem.cpp
Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d
Diffstat (limited to 'src/imports/platform')
| -rw-r--r-- | src/imports/platform/qquickplatformmenuitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp index 0a041a91..9f3abc1a 100644 --- a/src/imports/platform/qquickplatformmenuitem.cpp +++ b/src/imports/platform/qquickplatformmenuitem.cpp @@ -403,7 +403,7 @@ void QQuickPlatformMenuItem::setChecked(bool checked) \value MenuItem.AboutQtRole The item handles the "About Qt" menu item. \value MenuItem.AboutRole The item should be placed where the "About" menu item is in the application menu. The text of the menu item will be set to "About <application name>". The application name is fetched from the - \c{Info.plist} file in the application's bundle (See \l{Qt for OS X - Deployment}). + \c{Info.plist} file in the application's bundle (See \l{Qt for macOS - Deployment}). \value MenuItem.PreferencesRole The item should be placed where the "Preferences..." menu item is in the application menu. \value MenuItem.QuitRole The item should be placed where the Quit menu item is in the application menu. |