|author||Topi Reinio <firstname.lastname@example.org>||2016-08-03 12:00:41 +0200|
|committer||Topi Reiniö <email@example.com>||2016-08-12 08:30:29 +0000|
Doc: Change instances of '(Mac) OS X' to 'macOS'
As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change the occurrences where the Mac platform is discussed to use a macro \macos, which expands to 'macOS'. This helps with adapting to future renaming. Update the instructions on mac-specific Q_OS_* macro usage. Add a \target for the old 'Qt for OS X' topic to keep links working for other documentation modules that try to link with the old name. Change-Id: Id33fb0cd985df702a4ae4efb4c5fd428e77d9b85 Reviewed-by: Leena Miettinen <firstname.lastname@example.org>
Diffstat (limited to 'src/gui/kernel/qclipboard.cpp')
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 817c50d9b2..1aac3d6021 100644
@@ -110,22 +110,22 @@ QT_BEGIN_NAMESPACE
- \section1 Notes for OS X Users
+ \section1 Notes for \macos Users
- OS X supports a separate find buffer that holds the current
+ \macos supports a separate find buffer that holds the current
search string in Find operations. This find clipboard can be accessed
by specifying the FindBuffer mode.
- \section1 Notes for Windows and OS X Users
+ \section1 Notes for Windows and \macos Users
- \li Windows and OS X do not support the global mouse
+ \li Windows and \macos do not support the global mouse
selection; they only supports the global clipboard, i.e. they
only add text to the clipboard when an explicit copy or cut is
- \li Windows and OS X does not have the concept of ownership;
+ \li Windows and \macos does not have the concept of ownership;
the clipboard is a fully global resource so all applications are
notified of changes.
@@ -181,7 +181,7 @@ QClipboard::~QClipboard()
This signal is emitted when the clipboard data is changed.
- On OS X and with Qt version 4.3 or higher, clipboard
+ On \macos and with Qt version 4.3 or higher, clipboard
changes made by other applications will only be detected
when the application is activated.
@@ -193,7 +193,7 @@ QClipboard::~QClipboard()
This signal is emitted when the selection is changed. This only
applies to windowing systems that support selections, e.g. X11.
- Windows and OS X don't support selections.
+ Windows and \macos don't support selections.
\sa dataChanged(), findBufferChanged(), changed()
@@ -203,7 +203,7 @@ QClipboard::~QClipboard()
This signal is emitted when the find buffer is changed. This only
- applies to OS X.
+ applies to \macos.
With Qt version 4.3 or higher, clipboard changes made by other
applications will only be detected when the application is activated.
@@ -226,7 +226,7 @@ QClipboard::~QClipboard()
systems with a global mouse selection (e.g. X11).
\value FindBuffer indicates that data should be stored and retrieved from
- the Find buffer. This mode is used for holding search strings on OS X.
+ the Find buffer. This mode is used for holding search strings on \macos.