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.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/gui/painting/qpagedpaintdevice.cpp')
-rw-r--r-- | src/gui/painting/qpagedpaintdevice.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp index ecb952a8bd..2149bd8cff 100644 --- a/src/gui/painting/qpagedpaintdevice.cpp +++ b/src/gui/painting/qpagedpaintdevice.cpp @@ -136,7 +136,8 @@ QPagedPaintDevicePrivate *QPagedPaintDevice::dd() \enum QPagedPaintDevice::PageSize This enum type lists the available page sizes as defined in the Postscript - PPD standard. These values are duplicated in QPageSize and QPrinter. + PPD standard. These values are duplicated in QPageSize and QPrinter and + those types and enum will be merged in Qt 6. The defined sizes are: @@ -315,6 +316,7 @@ QPagedPaintDevice::PageSize QPagedPaintDevice::pageSize() const } /*! + \obsolete Use setPageSize(QPageSize) instead. Sets the page size to \a size. \a size is specified in millimeters. If the size matches a standard QPagedPaintDevice::PageSize then that page @@ -326,6 +328,8 @@ void QPagedPaintDevice::setPageSizeMM(const QSizeF &size) } /*! + \obsolete Use pageLayout().pageSize() instead. + Returns the page size in millimeters. */ QSizeF QPagedPaintDevice::pageSizeMM() const @@ -334,6 +338,7 @@ QSizeF QPagedPaintDevice::pageSizeMM() const } /*! + \obsolete Use setPageMargins(QMarginsF, QPageLayout::Unit) instead. Sets the margins to be used to \a margins. Margins are specified in millimeters. @@ -349,6 +354,7 @@ void QPagedPaintDevice::setMargins(const QMarginsF &margins) } /*! + \obsolete Use pageLayout().margins() instead. Returns the current margins of the paint device. The default is 0. Margins are specified in millimeters. |