diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-09 01:00:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-09 01:00:55 +0100 |
| commit | 261c0dedac1d97b5960d27eedaa017d45050b654 (patch) | |
| tree | f91c8e2a770f4c456f6465f28aecefc8c2bbeccf /src/gui/image | |
| parent | 830e06a3f8173621a99426e7da6ad9704eb701b3 (diff) | |
| parent | caa74f16d41ebe65e1edbea219f799cf246d6067 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I056b658ffe9390dfcbe2787e2bddc7f4e9b389dd
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 8 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index e508cc9413..18125460c7 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -2259,16 +2259,16 @@ bool QImage::reinterpretAsFormat(Format format) \sa convertToFormat() */ -void QImage::convertTo(Format f, Qt::ImageConversionFlags flags) +void QImage::convertTo(Format format, Qt::ImageConversionFlags flags) { - if (!d || f == QImage::Format_Invalid) + if (!d || format == QImage::Format_Invalid) return; detach(); - if (convertToFormat_inplace(f, flags)) + if (convertToFormat_inplace(format, flags)) return; - *this = convertToFormat_helper(f, flags); + *this = convertToFormat_helper(format, flags); } /*! diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 2a7393225e..13c81f18d0 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -95,9 +95,9 @@ public: void fill(const QColor &fillColor = Qt::white); #if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X(" Use QPainter or the fill(QColor)") + QT_DEPRECATED_X("Use QPainter or fill(QColor)") void fill(const QPaintDevice *device, const QPoint &ofs); - QT_DEPRECATED_X(" Use QPainter or the fill(QColor)") + QT_DEPRECATED_X("Use QPainter or fill(QColor)") void fill(const QPaintDevice *device, int xofs, int yofs); #endif |