diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-02 16:23:06 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-03 07:00:36 +0200 |
| commit | 6bbf3f0257603eb39d5511910e8bee1ed862b6cf (patch) | |
| tree | 6428d85d68637df32d7b94d6e55770164396f825 /src/printsupport/widgets/qprintpreviewwidget.cpp | |
| parent | 25351dcc549f1daddf5e2ae8a242191174342a3e (diff) | |
Mark obsolete QPrinter functions as deprecated from 5.15 on
Some of the methods are overrides of virtuals in QPagedPaintDevice, so document
and mark those as obsolete as well.
Adjust code that calls those APIs to use the recommended replacement.
Change-Id: I3cd1980609ea20808d17379a5f97ca595e869875
Pick-to: 5.15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/printsupport/widgets/qprintpreviewwidget.cpp')
| -rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp index 16b84e328d..bd22d5a6a5 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.cpp +++ b/src/printsupport/widgets/qprintpreviewwidget.cpp @@ -357,7 +357,7 @@ void QPrintPreviewWidgetPrivate::layoutPages() int numPagePlaces = numPages; int cols = 1; // singleMode and default if (viewMode == QPrintPreviewWidget::AllPagesView) { - if (printer->orientation() == QPrinter::Portrait) + if (printer->pageLayout().orientation() == QPageLayout::Portrait) cols = qCeil(qSqrt((float) numPages)); else cols = qFloor(qSqrt((float) numPages)); @@ -593,7 +593,8 @@ void QPrintPreviewWidget::setViewMode(ViewMode mode) QPrinter::Orientation QPrintPreviewWidget::orientation() const { Q_D(const QPrintPreviewWidget); - return d->printer->orientation(); + return d->printer->pageLayout().orientation() == QPageLayout::Portrait + ? QPrinter::Portrait : QPrinter::Landscape; } /*! @@ -603,7 +604,8 @@ QPrinter::Orientation QPrintPreviewWidget::orientation() const void QPrintPreviewWidget::setOrientation(QPrinter::Orientation orientation) { Q_D(QPrintPreviewWidget); - d->printer->setOrientation(orientation); + d->printer->setPageOrientation(orientation == QPrinter::Portrait + ? QPageLayout::Portrait : QPageLayout::Landscape); d->generatePreview(); } |