AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable URL support in the CBOR-JSON conversion in bootstrapped mode

Browse Source 
We don't need it.

Pick-to: 6.3
Change-Id: I74249c52dc02478ba93cfffd16d1dfc0e88f55ef
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Thiago Macieira 2022-02-08 09:29:18 -08:00
parent 5e378aaff6
commit 708de710f1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/serialization/qjsoncbor.cpp
View File

@ -205,10 +205,14 @@ static QJsonValue convertExtendedTypeToJson(QCborContainerPrivate *d)
switch (tag) { switch (tag) {
case qint64(QCborKnownTags::Url): 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) if (d->elements.at(1).type == QCborValue::String)
return QUrl::fromEncoded(d->byteData(1)->asByteArrayView()).toString(QUrl::FullyEncoded); return QUrl::fromEncoded(d->byteData(1)->asByteArrayView()).toString(QUrl::FullyEncoded);
Q_FALLTHROUGH(); Q_FALLTHROUGH();
#endif
case qint64(QCborKnownTags::DateTimeString): case qint64(QCborKnownTags::DateTimeString):
case qint64(QCborKnownTags::ExpectedBase64url): case qint64(QCborKnownTags::ExpectedBase64url):