summaryrefslogtreecommitdiffstats
path: root/src/printsupport
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-05-28 12:45:48 +0200
committerNico Vertriest <nico.vertriest@digia.com>2015-06-30 07:33:31 +0000
commita7f2af09114cfa0996794c85bc48a601f665772d (patch)
treea36d84d2026c90ba866954cb1ec7e4f7f7429ffe /src/printsupport
parent592f355271df09c791682650a64ef42ffe898a27 (diff)
Replace MAC OS X with OS X
Task-number: QTBUG-46374 Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/printsupport')
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.cpp6
-rw-r--r--src/printsupport/dialogs/qpagesetupdialog.cpp6
-rw-r--r--src/printsupport/kernel/qprinter.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index 47350bebcb..68027fdae8 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -387,13 +387,13 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter)
settings for each available printer can be modified via the dialog's
\uicontrol{Properties} push button.
- On Windows and Mac OS X, the native print dialog is used, which means that
+ On Windows and OS X, the native print dialog is used, which means that
some QWidget and QDialog properties set on the dialog won't be respected.
- The native print dialog on Mac OS X does not support setting printer options,
+ The native print dialog on OS X does not support setting printer options,
i.e. setOptions() and setOption() have no effect.
In Qt 4.4, it was possible to use the static functions to show a sheet on
- Mac OS X. This is no longer supported in Qt 4.5. If you want this
+ OS X. This is no longer supported in Qt 4.5. If you want this
functionality, use QPrintDialog::open().
\sa QPageSetupDialog, QPrinter
diff --git a/src/printsupport/dialogs/qpagesetupdialog.cpp b/src/printsupport/dialogs/qpagesetupdialog.cpp
index 72d80885af..425a8cd9d5 100644
--- a/src/printsupport/dialogs/qpagesetupdialog.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog.cpp
@@ -50,12 +50,12 @@ QT_BEGIN_NAMESPACE
\ingroup printing
\inmodule QtPrintSupport
- On Windows and Mac OS X the page setup dialog is implemented using
+ On Windows and OS X the page setup dialog is implemented using
the native page setup dialogs.
- Note that on Windows and Mac OS X custom paper sizes won't be
+ Note that on Windows and OS X custom paper sizes won't be
reflected in the native page setup dialogs. Additionally, custom
- page margins set on a QPrinter won't show in the native Mac OS X
+ page margins set on a QPrinter won't show in the native OS X
page setup dialog.
\sa QPrinter, QPrintDialog
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index a106a58502..a9dfcc8f09 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 Mac OS X, QPrinter uses
+ When printing directly to a printer on Windows or OS X, 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
- Mac OS X can generate PDF's from its print engine, set the output format
+ OS X can generate PDF's from its print engine, set the output format
back to NativeFormat.
\sa outputFileName(), setOutputFormat()
@@ -1371,7 +1371,7 @@ QPrinter::ColorMode QPrinter::colorMode() const
\obsolete
Returns the number of copies to be printed. The default value is 1.
- On Windows, Mac OS X and X11 systems that support CUPS, this will always
+ On Windows, OS X and X11 systems that support CUPS, this will always
return 1 as these operating systems can internally handle the number
of copies.