summaryrefslogtreecommitdiffstats
path: root/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-08-11 14:51:37 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-08-15 07:09:50 +0000
commit85197ddb8d6da0e5cf74b8d945c076d4db3986a8 (patch)
tree9249e2374ce36df84c3ecf31ea8727a651c8f6b6 /src/qdoc/doc/qdoc-manual-topiccmds.qdoc
parentefa8c3361bea905afef1a051900275bf33ccb9ef (diff)
Doc: Change instances of 'OS X' to 'macOS'
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 within \code blocks in QDoc manual, where macros are not expanded. Change-Id: Ic742163948f3970d2acaa179eb02d4e0c1593bf8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/qdoc/doc/qdoc-manual-topiccmds.qdoc')
-rw-r--r--src/qdoc/doc/qdoc-manual-topiccmds.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 2535fd534..92fe47e05 100644
--- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -950,7 +950,7 @@
Qt is a C++ toolkit for cross-platform GUI
application development. Qt provides single-source
- portability across Microsoft Windows, OS X, Linux,
+ portability across Microsoft Windows, macOS, Linux,
and all major commercial Unix variants.
Qt provides application developers with all the