diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-08-12 11:12:22 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@theqtcompany.com> | 2016-08-15 07:10:34 +0000 |
| commit | c0f58d5283ce981b8cfbc43f602a3b6553e26ce2 (patch) | |
| tree | 1900e9bac5bc3520736f1ae6b865524be6e8a8ff | |
| parent | 56d711667f4601016b474b3d463ce07659c42b9a (diff) | |
| download | qtquickcontrols-c0f58d5283ce981b8cfbc43f602a3b6553e26ce2.tar.gz | |
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 platform is
discussed to use the macro \macos (defined in the documentation
configuration in qtbase).
Change-Id: I5ca47e4d830c12df297ee298ed22fd2d41dee739
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| -rw-r--r-- | src/controls/Private/qquickstyleitem.cpp | 2 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index d7d2d4c3..7b0446db 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -67,7 +67,7 @@ static inline HIRect qt_hirectForQRect(const QRect &convertRect, const QRect &re returned if it can't be obtained. It is the caller's responsibility to CGContextRelease the context when finished using it. - \warning This function is only available on Mac OS X. + \warning This function is only available on \macos. \warning This function is duplicated in qmacstyle_mac.mm */ CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 7ad34a30..0e0e1ee2 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -46,7 +46,7 @@ <tr><td style="border:0px"> \endraw \image qtquickcontrols-example-gallery-osx.png - \caption OS X + \caption \macos \raw HTML </td><td style="border:0px"> \endraw |