diff options
author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-08-11 14:59:41 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@theqtcompany.com> | 2016-08-12 13:15:56 +0000 |
commit | 15c849dcfded8818765e439f521a665ae12e707a (patch) | |
tree | 9d2e9ae2fb9a240166e3051998ffb277bf3e07c8 /examples | |
parent | b8e24de4ba0876a3686cf5da5b1b6f47603c1bc7 (diff) |
Doc: Change instances of 'OS X' to 'macOS'v5.6.2
As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the Mac platform
is discussed to use the macro \macos (defined in the documentation
configuration in qtbase), except in link targets (QDoc doesn't
expand macros in those).
Add a 'macOS' prefix to example titles to make it clear they are
specific to that platform.
Change-Id: I6bac8d92ca080adf7138a12e0f792c132e382f5d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'examples')
3 files changed, 10 insertions, 10 deletions
diff --git a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc index 56c515e..6199a79 100644 --- a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc +++ b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc @@ -26,16 +26,16 @@ ****************************************************************************/ /*! - \title Embedded QWindow + \title macOS: Embedded QWindow \ingroup examples-qtmacextras \example embeddedqwindow - \brief Demonstrates embedding a QWindow into an view hierarchy of a Mac - OS X application. + \brief Demonstrates embedding a QWindow into an view hierarchy of a \macos + application. - This OS X-specific example shows how to create a view hierarchy + This \macos-specific example shows how to create a view hierarchy containing a QWindow, with handling of Qt's mouse and keyboard events. \include examples-run.qdocinc - \sa {Qt for OS X}, {Qt Mac Extras} + \sa {Qt for macOS}, {Qt Mac Extras} */ diff --git a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc index 38c828a..d51df16 100644 --- a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc +++ b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \title Mac Functions + \title macOS Functions \ingroup examples-qtmacextras \example macfunctions \brief Demonstrates using functions from the QtMac namespace. @@ -36,5 +36,5 @@ \include examples-run.qdocinc - \sa {Qt for OS X}, {Qt Mac Extras} + \sa {Qt for macOS}, {Qt Mac Extras} */ diff --git a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc index 683d1d0..9567f66 100644 --- a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc +++ b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc @@ -26,19 +26,19 @@ ****************************************************************************/ /*! - \title Mac Pasteboard MIME Converter + \title macOS: Pasteboard MIME Converter \ingroup examples-qtmacextras \example macpasteboardmime \brief Demonstrates using QMacPasteboardMime class. This example shows how to use QMacPasteboardMime to do conversion between a MIME type and a Uniform Type Identifier (UTI) format used - on OS X. + on \macos. The example creates a widget that accepts drag & drop events, and reads contents of dropped business cards in vCard format. \include examples-run.qdocinc - \sa {Qt for OS X}, {Qt Mac Extras} + \sa {Qt for macOS}, {Qt Mac Extras} */ |