Fix compilation with disabled deprecated APIs

The QImageIOHandler::name() has been deprecated since 5.13, but its
overrides weren't. Enabled compilation of the overrides only when the
QImageIOHandler::name() is compiled.

Task-number: QTBUG-76491
Change-Id: I913f03f730969ea88864a5a08afe50c4eac533ca
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

12 files changed, 24 insertions, 0 deletions

diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp
index 3a44b51..845f9b3 100644
--- a/src/plugins/imageformats/dds/qddshandler.cpp
+++ b/src/plugins/imageformats/dds/qddshandler.cpp
@@ -1382,10 +1382,12 @@ QDDSHandler::QDDSHandler() :
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QDDSHandler::name() const
 {
     return QByteArrayLiteral("dds");
 }
+#endif
 
 bool QDDSHandler::canRead() const
 {
diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h
index 665bd16..f4bc888 100644
--- a/src/plugins/imageformats/dds/qddshandler.h
+++ b/src/plugins/imageformats/dds/qddshandler.h
@@ -53,7 +53,9 @@ class QDDSHandler : public QImageIOHandler
 public:
     QDDSHandler();
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     bool canRead() const override;
     bool read(QImage *image) override;
diff --git a/src/plugins/imageformats/icns/qicnshandler.cpp b/src/plugins/imageformats/icns/qicnshandler.cpp
index a854506..9733ed7 100644
--- a/src/plugins/imageformats/icns/qicnshandler.cpp
+++ b/src/plugins/imageformats/icns/qicnshandler.cpp
@@ -651,10 +651,12 @@ QICNSHandler::QICNSHandler() :
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QICNSHandler::name() const
 {
     return QByteArrayLiteral("icns");
 }
+#endif
 
 bool QICNSHandler::canRead(QIODevice *device)
 {
diff --git a/src/plugins/imageformats/icns/qicnshandler_p.h b/src/plugins/imageformats/icns/qicnshandler_p.h
index 84c7bf1..b532045 100644
--- a/src/plugins/imageformats/icns/qicnshandler_p.h
+++ b/src/plugins/imageformats/icns/qicnshandler_p.h
@@ -132,7 +132,9 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     bool supportsOption(ImageOption option) const override;
     QVariant option(ImageOption option) const override;
diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp
index 17373fd..ce23480 100644
--- a/src/plugins/imageformats/jp2/qjp2handler.cpp
+++ b/src/plugins/imageformats/jp2/qjp2handler.cpp
@@ -308,6 +308,7 @@ bool QJp2Handler::supportsOption(ImageOption option) const
     return (option == Quality || option == SubType);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Return the common identifier of the format.
     For JPEG 2000 this will return "jp2".
@@ -316,6 +317,7 @@ QByteArray QJp2Handler::name() const
 {
     return QByteArrayLiteral("jp2");
 }
+#endif
 
 /*!
     Automatic resource handling for a jas_image_t*.
diff --git a/src/plugins/imageformats/jp2/qjp2handler_p.h b/src/plugins/imageformats/jp2/qjp2handler_p.h
index e81ec9e..16ddc8a 100644
--- a/src/plugins/imageformats/jp2/qjp2handler_p.h
+++ b/src/plugins/imageformats/jp2/qjp2handler_p.h
@@ -64,7 +64,9 @@ public:
     QVariant option(ImageOption option) const override;
     void setOption(ImageOption option, const QVariant &value) override;
     bool supportsOption(ImageOption option) const override;
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
 private:
     Q_DECLARE_PRIVATE(QJp2Handler)
diff --git a/src/plugins/imageformats/tga/qtgahandler.cpp b/src/plugins/imageformats/tga/qtgahandler.cpp
index 8f5eb12..9277e50 100644
--- a/src/plugins/imageformats/tga/qtgahandler.cpp
+++ b/src/plugins/imageformats/tga/qtgahandler.cpp
@@ -98,10 +98,12 @@ bool QTgaHandler::read(QImage *image)
     return !image->isNull();
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QTgaHandler::name() const
 {
     return "tga";
 }
+#endif
 
 QVariant QTgaHandler::option(ImageOption option) const
 {
diff --git a/src/plugins/imageformats/tga/qtgahandler.h b/src/plugins/imageformats/tga/qtgahandler.h
index 5ef7e02..6550a11 100644
--- a/src/plugins/imageformats/tga/qtgahandler.h
+++ b/src/plugins/imageformats/tga/qtgahandler.h
@@ -55,7 +55,9 @@ public:
     bool canRead() const override;
     bool read(QImage *image) override;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp
index cd70fb9..3d404bd 100644
--- a/src/plugins/imageformats/tiff/qtiffhandler.cpp
+++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp
@@ -805,10 +805,12 @@ bool QTiffHandler::write(const QImage &image)
     return true;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QTiffHandler::name() const
 {
     return "tiff";
 }
+#endif
 
 QVariant QTiffHandler::option(ImageOption option) const
 {
diff --git a/src/plugins/imageformats/tiff/qtiffhandler_p.h b/src/plugins/imageformats/tiff/qtiffhandler_p.h
index 2090e38..c2eb412 100644
--- a/src/plugins/imageformats/tiff/qtiffhandler_p.h
+++ b/src/plugins/imageformats/tiff/qtiffhandler_p.h
@@ -55,7 +55,9 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp
index 578a701..4d6bcbe 100644
--- a/src/plugins/imageformats/webp/qwebphandler.cpp
+++ b/src/plugins/imageformats/webp/qwebphandler.cpp
@@ -310,10 +310,12 @@ bool QWebpHandler::supportsOption(ImageOption option) const
         || option == BackgroundColor;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QWebpHandler::name() const
 {
     return QByteArrayLiteral("webp");
 }
+#endif
 
 int QWebpHandler::imageCount() const
 {
diff --git a/src/plugins/imageformats/webp/qwebphandler_p.h b/src/plugins/imageformats/webp/qwebphandler_p.h
index 950b501..31574b4 100644
--- a/src/plugins/imageformats/webp/qwebphandler_p.h
+++ b/src/plugins/imageformats/webp/qwebphandler_p.h
@@ -56,7 +56,9 @@ public:
     ~QWebpHandler();
 
 public:
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     bool canRead() const override;
     bool read(QImage *image) override;