summaryrefslogtreecommitdiffstats
path: root/src/testlib/doc/src/qttestlib-manual.qdoc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-08-03 12:00:41 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-08-12 08:30:29 +0000
commita2ae631c04fee752e492f2c0b8fd25f06abffd6b (patch)
treec23b323762193b93334aba8bc000687f156c0719 /src/testlib/doc/src/qttestlib-manual.qdoc
parentc38ac3dab8cbbdb494e09ccebe93c4e57a9987c3 (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/testlib/doc/src/qttestlib-manual.qdoc')
-rw-r--r--src/testlib/doc/src/qttestlib-manual.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index d8e2dc2516..d0f6296480 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -314,7 +314,7 @@
\li All platforms
\row \li CPU tick counter
\li -tickcounter
- \li Windows, OS X, Linux, many UNIX-like systems.
+ \li Windows, \macos, Linux, many UNIX-like systems.
\row \li Event Counter
\li -eventcounter
\li All platforms