diff options
Diffstat (limited to 'src/corelib/serialization/qjsoncbor.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsoncbor.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 67db3d7d6c..da07eca8a7 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -421,11 +421,13 @@ QJsonArray QCborArray::toJsonArray() const return convertToJsonArray(d.data()); } +#ifndef QT_NO_VARIANT QJsonArray QJsonPrivate::Variant::toJsonArray(const QVariantList &list) { const auto cborArray = QCborArray::fromVariantList(list); return convertToJsonArray(cborArray.d.data(), ConversionMode::FromVariantToJson); } +#endif // !QT_NO_VARIANT /*! Recursively converts every \l QCborValue value in this map to JSON using @@ -469,6 +471,7 @@ QJsonObject QCborMap::toJsonObject() const return convertToJsonObject(d.data()); } +#ifndef QT_NO_VARIANT QJsonObject QJsonPrivate::Variant::toJsonObject(const QVariantMap &map) { const auto cborMap = QCborMap::fromVariantMap(map); @@ -576,9 +579,9 @@ QVariant QCborValue::toVariant() const if (isSimpleType()) return QVariant::fromValue(toSimpleType()); - Q_UNREACHABLE(); - return QVariant(); + Q_UNREACHABLE_RETURN(QVariant()); } +#endif // !QT_NO_VARIANT /*! Converts the JSON value contained in \a v into its corresponding CBOR value @@ -632,6 +635,7 @@ QCborValue QCborValue::fromJsonValue(const QJsonValue &v) return QCborValue(); } +#ifndef QT_NO_VARIANT static void appendVariant(QCborContainerPrivate *d, const QVariant &variant) { // Handle strings and byte arrays directly, to avoid creating a temporary @@ -832,6 +836,7 @@ QCborArray QCborArray::fromVariantList(const QVariantList &list) appendVariant(a.d.data(), v); return a; } +#endif // !QT_NO_VARIANT /*! Converts all JSON items found in the \a array array to CBOR using @@ -863,6 +868,7 @@ QCborArray QCborArray::fromJsonArray(QJsonArray &&array) noexcept } +#ifndef QT_NO_VARIANT /*! Converts the CBOR values to QVariant using QCborValue::toVariant() and "stringifies" all the CBOR keys in this map, returning the QVariantMap that @@ -959,6 +965,7 @@ QCborMap QCborMap::fromVariantHash(const QVariantHash &hash) } return m; } +#endif // !QT_NO_VARIANT /*! Converts all JSON items found in the \a obj object to CBOR using |