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 10:30:31 +0200 |
| commit | 8f2d63febcc8c243ab86049755cf1b963d57f9f8 (patch) | |
| tree | 26b75958778403811da586fe722e629291034108 /src/gui/painting/qpagedpaintdevice.h | |
| parent | 22cc8e0d6fd8ac680927bc47965cff02b41688a9 (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
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 6bbf3f0257603eb39d5511910e8bee1ed862b6cf)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/painting/qpagedpaintdevice.h')
| -rw-r--r-- | src/gui/painting/qpagedpaintdevice.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h index 21e23e0eb4..143393cfba 100644 --- a/src/gui/painting/qpagedpaintdevice.h +++ b/src/gui/painting/qpagedpaintdevice.h @@ -224,11 +224,17 @@ public: bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units); QPageLayout pageLayout() const; +#if QT_DEPRECATED_SINCE(5,15) + QT_DEPRECATED_VERSION_X_5_15("Use setPageSize(QPageSize) instead.") virtual void setPageSize(PageSize size); + QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().pageSize().id() instead.") PageSize pageSize() const; + QT_DEPRECATED_VERSION_X_5_15("Use setPageSize(QPageSize) instead.") virtual void setPageSizeMM(const QSizeF &size); + QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().pageSize() instead.") QSizeF pageSizeMM() const; +#endif // ### Qt6 Remove in favor of QMarginsF struct Margins { @@ -238,8 +244,12 @@ public: qreal bottom; }; +#if QT_DEPRECATED_SINCE(5,15) + QT_DEPRECATED_VERSION_X_5_15("Use setPageMargins(QMarginsF, QPageLayout::Unit) instead.") virtual void setMargins(const Margins &margins); + QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().margins() instead.") Margins margins() const; +#endif protected: QPagedPaintDevice(QPagedPaintDevicePrivate *dd); |