Deprecate QJsonDocument methods for converting to/from JSON binary

Also remove the example code for deprecated methods and use CBOR instead
where it makes sense.

Task-number: QTBUG-81068
Change-Id: Iffb7a4b3d7b16a1e485fc05b3ab2e2468e9e0718
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 13 insertions, 4 deletions

diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp
index b9b1902f34..fe0500bdef 100644
--- a/src/corelib/serialization/qjsondocument.cpp
+++ b/src/corelib/serialization/qjsondocument.cpp
@@ -237,7 +237,7 @@ QJsonDocument &QJsonDocument::operator =(const QJsonDocument &other)
   the application.
   */
 
-#if QT_CONFIG(binaryjson)
+#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
 /*!
  Creates a QJsonDocument that uses the first \a size bytes from
  \a data. It assumes \a data contains a binary encoded JSON document.
@@ -385,10 +385,13 @@ QJsonDocument QJsonDocument::fromBinaryData(const QByteArray &data, DataValidati
 QByteArray QJsonDocument::toBinaryData() const
 {
     int size = 0;
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     const char *raw = rawData(&size);
+QT_WARNING_POP
     return QByteArray(raw, size);
 }
-#endif // QT_CONFIG(binaryjson)
+#endif // QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
 
 /*!
  Creates a QJsonDocument from the QVariant \a variant.
diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h
index 325e47b531..758bbfd9dd 100644
--- a/src/corelib/serialization/qjsondocument.h
+++ b/src/corelib/serialization/qjsondocument.h
@@ -111,13 +111,19 @@ public:
         BypassValidation
     };
 
-#if QT_CONFIG(binaryjson)
+#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use CBOR format instead")
     static QJsonDocument fromRawData(const char *data, int size, DataValidation validation = Validate);
+
+    QT_DEPRECATED_X("Use CBOR format instead")
     const char *rawData(int *size) const;
 
+    QT_DEPRECATED_X("Use CBOR format instead")
     static QJsonDocument fromBinaryData(const QByteArray &data, DataValidation validation  = Validate);
+
+    QT_DEPRECATED_X("Use CBOR format instead")
     QByteArray toBinaryData() const;
-#endif // QT_CONFIG(binaryjson)
+#endif // QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
 
     static QJsonDocument fromVariant(const QVariant &variant);
     QVariant toVariant() const;