diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-08 09:29:18 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-10 20:00:07 +0000 |
| commit | bcc0c5c145179e2b5829ce0dbcb745a1a1de55c1 (patch) | |
| tree | 87ee5b8f268598563d6f7da6c02c18085e8441f8 | |
| parent | 8414ba0fe46c6d7f4694ddcbc8c9ef33e35503ea (diff) | |
Disable URL support in the CBOR-JSON conversion in bootstrapped mode
We don't need it.
Change-Id: I74249c52dc02478ba93cfffd16d1dfc0e88f55ef
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 708de710f1ca9215ecb9ed2849e51c396a27129e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/serialization/qjsoncbor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 3d79388b1d..78a59cb65f 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -205,10 +205,14 @@ static QJsonValue convertExtendedTypeToJson(QCborContainerPrivate *d) switch (tag) { case qint64(QCborKnownTags::Url): - // use the fullly-encoded URL form +#ifdef QT_BOOTSTRAPPED + break; +#else + // use the fully-encoded URL form if (d->elements.at(1).type == QCborValue::String) return QUrl::fromEncoded(d->byteData(1)->asByteArrayView()).toString(QUrl::FullyEncoded); Q_FALLTHROUGH(); +#endif case qint64(QCborKnownTags::DateTimeString): case qint64(QCborKnownTags::ExpectedBase64url): |