3 files changed, 1 insertions, 34 deletions
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
index fc72985b76..7d6f5ef0cd 100644
--- a/src/gui/rhi/qshader.cpp
+++ b/src/gui/rhi/qshader.cpp
@@ -446,17 +446,8 @@ QShader QShader::fromSerialized(const QByteArray &data)
         ds >> descBin;
         d->desc = QShaderDescription::fromCbor(descBin);
     } else {
-#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
-        QT_WARNING_PUSH
-        QT_WARNING_DISABLE_DEPRECATED
-        QByteArray descBin;
-        ds >> descBin;
-        d->desc = QShaderDescription::fromBinaryJson(descBin);
-        QT_WARNING_POP
-#else
-        qWarning("Cannot load QShaderDescription from binary JSON due to disabled binaryjson feature");
+        qWarning("Can no longer load QShaderDescription from binary JSON.");
         d->desc = QShaderDescription();
-#endif
     }
     int count;
     ds >> count;
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp
index c159a25340..d813c25919 100644
--- a/src/gui/rhi/qshaderdescription.cpp
+++ b/src/gui/rhi/qshaderdescription.cpp
@@ -367,26 +367,6 @@ void QShaderDescription::serialize(QDataStream *stream) const
     d->writeToStream(stream);
 }
 
-#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \deprecated
-
-    Deserializes the given binary JSON \a data and returns a new
-    QShaderDescription.
-
-    \sa fromCbor()
- */
-QShaderDescription QShaderDescription::fromBinaryJson(const QByteArray &data)
-{
-    QShaderDescription desc;
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    QShaderDescriptionPrivate::get(&desc)->loadDoc(QJsonDocument::fromBinaryData(data));
-QT_WARNING_POP
-    return desc;
-}
-#endif
-
 /*!
     Deserializes the given CBOR \a data and returns a new QShaderDescription.
  */
diff --git a/src/gui/rhi/qshaderdescription_p.h b/src/gui/rhi/qshaderdescription_p.h
index 22b4f2282e..531b7422c3 100644
--- a/src/gui/rhi/qshaderdescription_p.h
+++ b/src/gui/rhi/qshaderdescription_p.h
@@ -75,10 +75,6 @@ public:
     void serialize(QDataStream *stream) const;
     QByteArray toJson() const;
 
-#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use CBOR format instead")
-    static QShaderDescription fromBinaryJson(const QByteArray &data);
-#endif
     static QShaderDescription fromCbor(const QByteArray &data);
     static QShaderDescription deserialize(QDataStream *stream, int version);