diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-08-03 12:00:41 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@theqtcompany.com> | 2016-08-12 08:30:29 +0000 |
| commit | a2ae631c04fee752e492f2c0b8fd25f06abffd6b (patch) | |
| tree | c23b323762193b93334aba8bc000687f156c0719 /src/gui/doc/src | |
| parent | c38ac3dab8cbbdb494e09ccebe93c4e57a9987c3 (diff) | |
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 <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/gui/doc/src')
| -rw-r--r-- | src/gui/doc/src/dnd.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc index 6e76c2faa9..27f236b7a6 100644 --- a/src/gui/doc/src/dnd.qdoc +++ b/src/gui/doc/src/dnd.qdoc @@ -399,7 +399,7 @@ On X11, the public \l{http://www.newplanetsoftware.com/xdnd/}{XDND protocol} is used, while on Windows Qt uses the OLE standard, and - Qt for OS X uses the Cocoa Drag Manager. On X11, XDND uses MIME, + Qt for \macos uses the Cocoa Drag Manager. On X11, XDND uses MIME, so no translation is necessary. The Qt API is the same regardless of the platform. On Windows, MIME-aware applications can communicate by using clipboard format names that are MIME types. Already some @@ -408,6 +408,6 @@ Custom classes for translating proprietary clipboard formats can be registered by reimplementing QWinMime on Windows or - QMacPasteboardMime on OS X. + QMacPasteboardMime on \macos. */ |