summaryrefslogtreecommitdiffstats
path: root/src/printsupport
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-13 01:05:02 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-13 01:05:02 +0200
commit6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch)
tree545dac994ef985cc91d92fa77da21581b6762c86 /src/printsupport
parentd04982dc84d66bec92b4b3767538676cf925ef17 (diff)
parentd9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/printsupport')
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.cpp8
-rw-r--r--src/printsupport/dialogs/qpagesetupdialog.cpp6
-rw-r--r--src/printsupport/kernel/qprinter.cpp6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index 7547e31a9e..3c5f882f2e 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -393,13 +393,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 OS X, the native print dialog is used, which means that
+ On Windows and \macos, 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 OS X does not support setting printer options,
+ The native print dialog on \macos 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
- OS X. This is no longer supported in Qt 4.5. If you want this
+ \macos. This is no longer supported in Qt 4.5. If you want this
functionality, use QPrintDialog::open().
\sa QPageSetupDialog, QPrinter
@@ -459,7 +459,7 @@ void QAbstractPrintDialog::setOptionTabs(const QList<QWidget*> &tabs)
and exec() to return \a result.
\note This function does not apply to the Native Print Dialog on the Mac
- OS X and Windows platforms, because the dialog is required to be modal
+ \macos and Windows platforms, because the dialog is required to be modal
and only the user can close it.
\sa QDialog::done()
diff --git a/src/printsupport/dialogs/qpagesetupdialog.cpp b/src/printsupport/dialogs/qpagesetupdialog.cpp
index cfc391ef43..81cbf87777 100644
--- a/src/printsupport/dialogs/qpagesetupdialog.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog.cpp
@@ -56,12 +56,12 @@ QT_BEGIN_NAMESPACE
\ingroup printing
\inmodule QtPrintSupport
- On Windows and OS X the page setup dialog is implemented using
+ On Windows and \macos the page setup dialog is implemented using
the native page setup dialogs.
- Note that on Windows and OS X custom paper sizes won't be
+ Note that on Windows and \macos 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 OS X
+ page margins set on a QPrinter won't show in the native \macos
page setup dialog.
\sa QPrinter, QPrintDialog
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index 584be11199..6d6d61b343 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -318,7 +318,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,
@@ -916,7 +916,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()
@@ -1386,7 +1386,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.