diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-03 18:42:30 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-04 08:37:59 +0200 |
| commit | 00a5629d8de18bc1a5dfb6e2526c03b4b021c903 (patch) | |
| tree | d444ede3eb66e5455e09c4de3fda32bcd7437a4a /src/printsupport/dialogs | |
| parent | 6b171dc6c0c0f0a822b212df77b58b28bd92716c (diff) | |
Remove deprecated QPrinter and QPagedPaintDevice APIs
Adjusting the QPrinter test case - some use cases no longer exist, or are
already tested in QPageSize and QPageLayout tests.
Adjust examples and manual tests.
Change-Id: I01cbc65f3d8031aea2dac86dd942126ba708b111
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/printsupport/dialogs')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_mac.mm | 2 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm index b88d03696a..16d8bdf74e 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm @@ -84,7 +84,7 @@ QT_USE_NAMESPACE PMGetOrientation(format, &orientation); QSizeF paperSize = QSizeF(paperRect.right - paperRect.left, paperRect.bottom - paperRect.top); printer->printEngine()->setProperty(QPrintEngine::PPK_CustomPaperSize, paperSize); - printer->printEngine()->setProperty(QPrintEngine::PPK_Orientation, orientation == kPMLandscape ? QPrinter::Landscape : QPrinter::Portrait); + printer->printEngine()->setProperty(QPrintEngine::PPK_Orientation, orientation == kPMLandscape ? QPageLayout::Landscape : QPageLayout::Portrait); } dialog->done((returnCode == NSModalResponseOK) ? QDialog::Accepted : QDialog::Rejected); diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index e9f2b5e882..ad52dc2b91 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -435,7 +435,7 @@ void QPrintPreviewDialogPrivate::setupActions() // Initial state: fitPageAction->setChecked(true); singleModeAction->setChecked(true); - if (preview->orientation() == QPrinter::Portrait) + if (preview->orientation() == QPageLayout::Portrait) portraitAction->setChecked(true); else landscapeAction->setChecked(true); @@ -609,7 +609,7 @@ void QPrintPreviewDialogPrivate::_q_pageSetup() if (pageSetupDialog->exec() == QDialog::Accepted) { // update possible orientation changes - if (preview->orientation() == QPrinter::Portrait) { + if (preview->orientation() == QPageLayout::Portrait) { portraitAction->setChecked(true); preview->setPortraitOrientation(); }else { |