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/gui/painting/qpagedpaintdevice.h | |
| 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/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 914a72b7be..f4e671f2d2 100644 --- a/src/gui/painting/qpagedpaintdevice.h +++ b/src/gui/painting/qpagedpaintdevice.h @@ -224,14 +224,24 @@ 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 +#if QT_DEPRECATED_SINCE(5,15) + QT_DEPRECATED_VERSION_X_5_15("Use setPageMargins(QMarginsF, QPageLayout::Unit) instead.") virtual void setMargins(const QMarginsF &margins); + QT_DEPRECATED_VERSION_X_5_15("Use pageLayout().margins() instead.") QMarginsF margins() const; +#endif protected: QPagedPaintDevice(QPagedPaintDevicePrivate *dd); |