summaryrefslogtreecommitdiffstats
path: root/src/printsupport/dialogs/qabstractprintdialog.cpp
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/dialogs/qabstractprintdialog.cpp
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/dialogs/qabstractprintdialog.cpp')
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.cpp8
1 files changed, 4 insertions, 4 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()