diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-25 20:32:54 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-28 19:37:36 +0000 |
| commit | f9e6f8efda350689211286db9154677924df8aab (patch) | |
| tree | 8690f7dc215b1a0404f56bb2046069803e77245c /src/gui/image/qpixmap.cpp | |
| parent | 8f65160c44253ccabfcd4029f0947534c6ba8612 (diff) | |
QtGui: mark some image functions as obsolete
Mark functions which were obsolete since Qt4 times as deprecated so they
can be removed with Qt6:
- QBitmap::transformed(QMatrix)
- QImageIOHandler::name()
- QImageWriter::setDescription()
- QImageWriter::description()
- QPixmap::fill()
- QPixmap::grabWindow()
- QPixmap::grabWidget()
- QTransform::det()
Change-Id: I8523065eb59a3242c4c4c195f31ae15c4dcbf8f7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 918e200549..091095f3fc 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -856,6 +856,7 @@ bool QPixmap::doImageIO(QImageWriter *writer, int quality) const } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -876,6 +877,14 @@ void QPixmap::fill(const QPaintDevice *device, const QPoint &p) Use QPainter or the fill(QColor) overload instead. */ +void QPixmap::fill(const QPaintDevice *device, int xofs, int yofs) +{ + Q_UNUSED(device) + Q_UNUSED(xofs) + Q_UNUSED(yofs) + qWarning("this function is deprecated, ignored"); +} +#endif /*! @@ -959,6 +968,7 @@ static void sendResizeEvents(QWidget *target) } #endif +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -982,6 +992,11 @@ QPixmap QPixmap::grabWidget(QObject *widget, const QRect &rectangle) Use QWidget::grab() instead. */ +QPixmap QPixmap::grabWidget(QObject *widget, int x, int y, int w, int h) +{ + return grabWidget(widget, QRect(x, y, w, h)); +} +#endif /***************************************************************************** QPixmap stream functions @@ -1578,6 +1593,7 @@ QPixmap QPixmap::fromImageReader(QImageReader *imageReader, Qt::ImageConversionF return QPixmap(data.take()); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn QPixmap QPixmap::grabWindow(WId window, int x, int y, int width, int height) @@ -1631,6 +1647,7 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h) " Defaulting to primary screen."); return QGuiApplication::primaryScreen()->grabWindow(window, x, y, w, h); } +#endif /*! \internal |