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 /src | |
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 'src')
-rw-r--r-- | src/macextras/doc/src/qtmacextras-examples.qdoc | 2 | ||||
-rw-r--r-- | src/macextras/doc/src/qtmacextras-index.qdoc | 4 | ||||
-rw-r--r-- | src/macextras/doc/src/qtmacextras-module-cpp.qdoc | 2 | ||||
-rw-r--r-- | src/macextras/qmacfunctions.mm | 2 | ||||
-rw-r--r-- | src/macextras/qmacfunctions_ios.mm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/macextras/doc/src/qtmacextras-examples.qdoc b/src/macextras/doc/src/qtmacextras-examples.qdoc index 9c3bc50..ce6d305 100644 --- a/src/macextras/doc/src/qtmacextras-examples.qdoc +++ b/src/macextras/doc/src/qtmacextras-examples.qdoc @@ -48,5 +48,5 @@ Here is a list of example applications demonstrating the functionality provided by the \l{Qt Mac Extras} module. -\note These examples work only on \l{Qt for OS X}{OS X} operating system. +\note These examples work only on \l{Qt for macOS}{\macos} operating system. */ diff --git a/src/macextras/doc/src/qtmacextras-index.qdoc b/src/macextras/doc/src/qtmacextras-index.qdoc index 0f02337..d2dd3dc 100644 --- a/src/macextras/doc/src/qtmacextras-index.qdoc +++ b/src/macextras/doc/src/qtmacextras-index.qdoc @@ -41,10 +41,10 @@ /*! \page qtmacextras-index.html \title Qt Mac Extras - \brief Provides functionality specific to the OS X operating system. + \brief Provides functionality specific to the \macos operating system. Qt Mac Extras provide classes and functions that enable you to use - miscellaneous functionality specific to the OS X and iOS operating systems. + miscellaneous functionality specific to the \macos and iOS operating systems. \section1 Getting Started diff --git a/src/macextras/doc/src/qtmacextras-module-cpp.qdoc b/src/macextras/doc/src/qtmacextras-module-cpp.qdoc index 2d787ea..eb2a650 100644 --- a/src/macextras/doc/src/qtmacextras-module-cpp.qdoc +++ b/src/macextras/doc/src/qtmacextras-module-cpp.qdoc @@ -41,7 +41,7 @@ /*! \module QtMacExtras \title Qt Mac Extras C++ Classes - \brief Provides classes and functions specific to OS X and iOS operating systems. + \brief Provides classes and functions specific to \macos and iOS operating systems. \ingroup modules \ingroup technology-apis diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm index 5758cbb..aceab43 100644 --- a/src/macextras/qmacfunctions.mm +++ b/src/macextras/qmacfunctions.mm @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \namespace QtMac \inmodule QtMacExtras \since 5.2 - \brief The QtMac namespace contains miscellaneous functionality specific to the OS X and iOS operating systems. + \brief The QtMac namespace contains miscellaneous functionality specific to the \macos and iOS operating systems. \inheaderfile QtMac */ diff --git a/src/macextras/qmacfunctions_ios.mm b/src/macextras/qmacfunctions_ios.mm index fe376a1..771bf7a 100644 --- a/src/macextras/qmacfunctions_ios.mm +++ b/src/macextras/qmacfunctions_ios.mm @@ -51,7 +51,7 @@ CGContextRef currentCGContext() Sets the value shown on the application icon a.k.a badge to \a number. - Unlike its OS X counterpart, only numbers can be used. + Unlike its \macos counterpart, only numbers can be used. \sa applicationIconBadgeNumber(), setBadgeLabelText() */ |