diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-24 17:36:01 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-24 18:41:43 +0000 |
commit | beb7d695a8051bb800f6f595140c4b5e1c5c15bc (patch) | |
tree | ed8d6f7c65ea7646e8bdae1a8ca4658543b46605 /src/imports/platform | |
parent | d3ea857c52e6105112d9df5654d9ce1dd1884088 (diff) |
Doc: fix names in Qt Labs Platform docs
OS X -> macOS, GTK -> GTK+
Change-Id: I501bc5bc6d8ecff647f701febb777c5207b593cd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/platform')
6 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp index 3b3bf8b4..17607a28 100644 --- a/src/imports/platform/qquickplatformcolordialog.cpp +++ b/src/imports/platform/qquickplatformcolordialog.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE A native platform color dialog is currently available on the following platforms: \list - \li OS X + \li macOS \li Linux (when running with the GTK+ platform theme) \endlist diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp index 11a193c6..e0fcc23a 100644 --- a/src/imports/platform/qquickplatformfontdialog.cpp +++ b/src/imports/platform/qquickplatformfontdialog.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE A native platform font dialog is currently available on the following platforms: \list - \li OS X + \li macOS \li Linux (when running with the GTK+ platform theme) \endlist diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp index cbe07e71..4d381dbf 100644 --- a/src/imports/platform/qquickplatformmenu.cpp +++ b/src/imports/platform/qquickplatformmenu.cpp @@ -102,10 +102,10 @@ QT_BEGIN_NAMESPACE A native platform menu is currently available on the following platforms: \list - \li OS X + \li macOS \li iOS \li Android - \li Linux (only available as a stand-alone context menu when running with the GTK platform theme) + \li Linux (only available as a stand-alone context menu when running with the GTK+ platform theme) \endlist \input includes/widgets.qdocinc 1 diff --git a/src/imports/platform/qquickplatformmenubar.cpp b/src/imports/platform/qquickplatformmenubar.cpp index 249bb014..02acbb43 100644 --- a/src/imports/platform/qquickplatformmenubar.cpp +++ b/src/imports/platform/qquickplatformmenubar.cpp @@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE MenuBar is currently available on the following platforms: \list - \li OS X + \li macOS \li Android \li Linux (only available on desktop environments that provide a global D-Bus menu bar) \endlist diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp index 5417c3e0..e5da667a 100644 --- a/src/imports/platform/qquickplatformmenuitem.cpp +++ b/src/imports/platform/qquickplatformmenuitem.cpp @@ -396,7 +396,7 @@ void QQuickPlatformMenuItem::setChecked(bool checked) \qmlproperty enumeration Qt.labs.platform::MenuItem::role This property holds the role of the item. The role determines whether - the item should be placed into the application menu on OS X. + the item should be placed into the application menu on macOS. Available values: \value MenuItem.NoRole The item should not be put into the application menu diff --git a/src/imports/platform/qquickplatformsystemtrayicon.cpp b/src/imports/platform/qquickplatformsystemtrayicon.cpp index 258af11e..49f1d281 100644 --- a/src/imports/platform/qquickplatformsystemtrayicon.cpp +++ b/src/imports/platform/qquickplatformsystemtrayicon.cpp @@ -130,7 +130,7 @@ QT_BEGIN_NAMESPACE \li All desktop environments that implement the \l{http://www.freedesktop.org/wiki/Specifications/StatusNotifierItem/StatusNotifierItem} {freedesktop.org D-Bus StatusNotifierItem specification}, including recent versions of KDE and Unity. - \li All supported versions of OS X. Note that the Growl notification system must be installed + \li All supported versions of macOS. Note that the Growl notification system must be installed for showMessage() to display messages on OS X prior to 10.8 (Mountain Lion). \endlist |