Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        src/corelib/Qt5CoreConfigExtras.cmake.in
        src/corelib/Qt5CoreMacros.cmake
        src/dbus/Qt5DBusConfigExtras.cmake.in
        src/widgets/Qt5WidgetsConfigExtras.cmake.in

Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp
index fe0500bdef..0be0fc020d 100644
--- a/src/corelib/serialization/qjsondocument.cpp
+++ b/src/corelib/serialization/qjsondocument.cpp
@@ -405,17 +405,17 @@ QJsonDocument QJsonDocument::fromVariant(const QVariant &variant)
 {
     QJsonDocument doc;
 
-    switch (variant.type()) {
-    case QVariant::Map:
+    switch (variant.userType()) {
+    case QMetaType::QVariantMap:
         doc.setObject(QJsonObject::fromVariantMap(variant.toMap()));
         break;
-    case QVariant::Hash:
+    case QMetaType::QVariantHash:
         doc.setObject(QJsonObject::fromVariantHash(variant.toHash()));
         break;
-    case QVariant::List:
+    case QMetaType::QVariantList:
         doc.setArray(QJsonArray::fromVariantList(variant.toList()));
         break;
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         doc.d = qt_make_unique<QJsonDocumentPrivate>();
         doc.d->value = QCborArray::fromStringList(variant.toStringList());
         break;