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/text/qfontdatabase.cpp | |
| 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/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 074d9707f1..0621f2a524 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -2043,7 +2043,7 @@ bool QFontDatabase::hasFamily(const QString &family) const Returns \c true if and only if the \a family font family is private. - This happens, for instance, on OS X and iOS, where the system UI fonts are not + This happens, for instance, on \macos and iOS, where the system UI fonts are not accessible to the user. For completeness, QFontDatabase::families() returns all font families, including the private ones. You should use this function if you are developing a font selection control in order to keep private fonts hidden. |