path: root/doc
diff options
authorTopi Reinio <>2016-08-03 12:00:41 +0200
committerTopi Reiniƶ <>2016-08-12 08:30:29 +0000
commita2ae631c04fee752e492f2c0b8fd25f06abffd6b (patch)
treec23b323762193b93334aba8bc000687f156c0719 /doc
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 <>
Diffstat (limited to 'doc')
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index 71a9dc30d1..da583aedcd 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -10,6 +10,7 @@ macro.gui = "\\b"
macro.HR.HTML = "<hr />"
macro.iacute.HTML = "&iacute;"
macro.key = "\\b"
+macro.macos = "macOS" = "\\b"
macro.oslash.HTML = "&oslash;"
macro.ouml.HTML = "&ouml;"