diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-03-04 09:54:35 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-04 14:39:18 +0000 |
| commit | 2a4b95778993b00499eb94f61a87330fdbadf947 (patch) | |
| tree | 168147adcc2854cb6723335b5abffe9d7585c7f4 /src/gui/image/qbmphandler.cpp | |
| parent | b4e17a48646a1d2156b7d56ab6003db46af79cec (diff) | |
| parent | 048f0a00fa7b46f531fbe3ed6d1babae9858e8c2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I99ee6f8b4bdc372437ee60d1feab931487fe55c4
Diffstat (limited to 'src/gui/image/qbmphandler.cpp')
| -rw-r--r-- | src/gui/image/qbmphandler.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp index d447faaceb..d559913161 100644 --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -870,13 +870,6 @@ void QBmpHandler::setOption(ImageOption option, const QVariant &value) Q_UNUSED(value); } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QBmpHandler::name() const -{ - return formatName(); -} -#endif - QT_END_NAMESPACE #endif // QT_NO_IMAGEFORMAT_BMP |