diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-10 01:00:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-10 17:01:22 +0200 |
| commit | 85d3061c1cd4617ef09cb381320611c27da205a5 (patch) | |
| tree | 2e4755ff4804008f982480d1669ba7659c3685a6 /src/plugins/imageformats/gif/qgifhandler.cpp | |
| parent | ca6a037d95ed1915773bf28f9190a012164c6443 (diff) | |
| parent | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/plugins/imageformats/gif/qgifhandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/gif/qgifhandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp index 1aef1a24d2..a6029b691c 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -1215,9 +1215,11 @@ int QGifHandler::currentImageNumber() const return frameNumber; } +#if QT_DEPRECATED_SINCE(5, 13) QByteArray QGifHandler::name() const { return "gif"; } +#endif QT_END_NAMESPACE |