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.h | |
| 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.h')
| -rw-r--r-- | src/gui/image/qpixmap.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 55cca7a766..2a7393225e 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -94,8 +94,12 @@ public: static int defaultDepth(); void fill(const QColor &fillColor = Qt::white); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X(" Use QPainter or the fill(QColor)") void fill(const QPaintDevice *device, const QPoint &ofs); - inline void fill(const QPaintDevice *device, int xofs, int yofs) { fill(device, QPoint(xofs, yofs)); } + QT_DEPRECATED_X(" Use QPainter or the fill(QColor)") + void fill(const QPaintDevice *device, int xofs, int yofs); +#endif QBitmap mask() const; void setMask(const QBitmap &); @@ -111,10 +115,14 @@ public: #endif QBitmap createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode = Qt::MaskInColor) const; - static QPixmap grabWindow(WId, int x=0, int y=0, int w=-1, int h=-1); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QScreen::grabWindow() instead") + static QPixmap grabWindow(WId, int x = 0, int y = 0, int w = -1, int h = -1); + QT_DEPRECATED_X("Use QWidget::grab() instead") static QPixmap grabWidget(QObject *widget, const QRect &rect); - static inline QPixmap grabWidget(QObject *widget, int x=0, int y=0, int w=-1, int h=-1) - { return grabWidget(widget, QRect(x, y, w, h)); } + QT_DEPRECATED_X("Use QWidget::grab() instead") + static QPixmap grabWidget(QObject *widget, int x = 0, int y = 0, int w = -1, int h = -1); +#endif inline QPixmap scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio, Qt::TransformationMode mode = Qt::FastTransformation) const |