diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-03 15:04:57 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-05-03 16:04:52 +0000 |
| commit | eac736e0fbc7f11bbc82901cbf1058562df31f53 (patch) | |
| tree | db51994c92c5df1439eb8345f94213cac757bf4f /src/plugins/printsupport | |
| parent | 0679b96338b0803a3c9aced772396470bcf7e1e6 (diff) | |
| parent | 60fefff22f7fa259a8bdb023d1ec9a57cfd34bfb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/printsupport')
| -rw-r--r-- | src/plugins/printsupport/cups/qcupsprintengine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/printsupport/cups/qcupsprintengine.cpp b/src/plugins/printsupport/cups/qcupsprintengine.cpp index f204e3b0da..c9683eb99d 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine.cpp +++ b/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -285,7 +285,10 @@ void QCupsPrintEnginePrivate::changePrinter(const QString &newPrinter) grayscale = m_printDevice.defaultColorMode() == QPrint::GrayScale; // Get the equivalent page size for this printer as supported names may be different - setPageSize(m_pageLayout.pageSize()); + if (m_printDevice.supportedPageSize(m_pageLayout.pageSize()).isValid()) + setPageSize(m_pageLayout.pageSize()); + else + setPageSize(QPageSize(m_pageLayout.pageSize().size(QPageSize::Point), QPageSize::Point)); } void QCupsPrintEnginePrivate::setPageSize(const QPageSize &pageSize) |