From a2ffb35ac2354735a95b21557a762aa16d7140a3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 24 Jan 2018 11:41:37 -0800
Subject: QJsonValue: use the fully-encoded form of a URL in fromVariant()

For compatibility with other parsers that may expect it to be so.

Change-Id: I56b444f9d6274221a3b7fffd150cd66390f98fd5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/corelib/serialization/qjsonvalue.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/corelib/serialization/qjsonvalue.cpp')

diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp
index 33707b6ec35..989d6d51db2 100644
--- a/src/corelib/serialization/qjsonvalue.cpp
+++ b/src/corelib/serialization/qjsonvalue.cpp
@@ -40,6 +40,7 @@
 #include <qjsonobject.h>
 #include <qjsonvalue.h>
 #include <qjsonarray.h>
+#include <qurl.h>
 #include <qvariant.h>
 #include <qstringlist.h>
 #include <qdebug.h>
@@ -407,6 +408,14 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
                 \li QMetaType::QVariantHash
             \endlist
         \li QJsonValue::Object
+
+    \row
+        \li
+            \list
+                \li QMetaType::QUrl
+            \endlist
+        \li QJsonValue::String. The conversion will use QUrl::toString() with flag
+            QUrl::FullyEncoded, so as to ensure maximum compatibility in parsing the URL
     \endtable
 
     For all other QVariant types a conversion to a QString will be attempted. If the returned string
@@ -439,6 +448,8 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
     case QVariant::Hash:
         return QJsonValue(QJsonObject::fromVariantHash(variant.toHash()));
 #ifndef QT_BOOTSTRAPPED
+    case QVariant::Url:
+        return QJsonValue(variant.toUrl().toString(QUrl::FullyEncoded));
     case QMetaType::QJsonValue:
         return variant.toJsonValue();
     case QMetaType::QJsonObject:
-- 
cgit v1.2.3