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/printsupport/kernel/qprinter.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/printsupport/kernel/qprinter.cpp')
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 2cecf61573..539ba06bdb 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -311,7 +311,7 @@ public: features, such as orientation and resolution, and to step through the pages in a document as it is generated. - When printing directly to a printer on Windows or OS X, QPrinter uses + When printing directly to a printer on Windows or \macos, QPrinter uses the built-in printer drivers. On X11, QPrinter uses the \l{Common Unix Printing System (CUPS)} to send PDF output to the printer. As an alternative, @@ -909,7 +909,7 @@ QString QPrinter::outputFileName() const QPrinter uses Qt's cross-platform PDF print engines respectively. If you can produce this format natively, for example - OS X can generate PDF's from its print engine, set the output format + \macos can generate PDF's from its print engine, set the output format back to NativeFormat. \sa outputFileName(), setOutputFormat() @@ -1379,7 +1379,7 @@ QPrinter::ColorMode QPrinter::colorMode() const \obsolete Returns the number of copies to be printed. The default value is 1. - On Windows, OS X and X11 systems that support CUPS, this will always + On Windows, \macos and X11 systems that support CUPS, this will always return 1 as these operating systems can internally handle the number of copies. |