Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qvariant.cpp
	src/corelib/serialization/qjsoncbor.cpp
	src/corelib/serialization/qjsonvalue.cpp
	src/corelib/tools/tools.pri
	src/gui/image/qimage.cpp
	src/gui/kernel/qguivariant.cpp
	src/widgets/kernel/qshortcut.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json
	tests/auto/tools/moc/tst_moc.cpp
        src/opengl/qglframebufferobject.cpp

Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271

1 files changed, 19 insertions, 19 deletions

diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index e3804f74f8..bcbb22fba6 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -325,7 +325,7 @@ int QDBusMetaType::signatureToType(const char *signature)
     switch (signature[0])
     {
     case DBUS_TYPE_BOOLEAN:
-        return QVariant::Bool;
+        return QMetaType::Bool;
 
     case DBUS_TYPE_BYTE:
         return QMetaType::UChar;
@@ -337,22 +337,22 @@ int QDBusMetaType::signatureToType(const char *signature)
         return QMetaType::UShort;
 
     case DBUS_TYPE_INT32:
-        return QVariant::Int;
+        return QMetaType::Int;
 
     case DBUS_TYPE_UINT32:
-        return QVariant::UInt;
+        return QMetaType::UInt;
 
     case DBUS_TYPE_INT64:
-        return QVariant::LongLong;
+        return QMetaType::LongLong;
 
     case DBUS_TYPE_UINT64:
-        return QVariant::ULongLong;
+        return QMetaType::ULongLong;
 
     case DBUS_TYPE_DOUBLE:
-        return QVariant::Double;
+        return QMetaType::Double;
 
     case DBUS_TYPE_STRING:
-        return QVariant::String;
+        return QMetaType::QString;
 
     case DBUS_TYPE_OBJECT_PATH:
         return QDBusMetaTypeId::objectpath();
@@ -369,13 +369,13 @@ int QDBusMetaType::signatureToType(const char *signature)
     case DBUS_TYPE_ARRAY:       // special case
         switch (signature[1]) {
         case DBUS_TYPE_BYTE:
-            return QVariant::ByteArray;
+            return QMetaType::QByteArray;
 
         case DBUS_TYPE_STRING:
-            return QVariant::StringList;
+            return QMetaType::QStringList;
 
         case DBUS_TYPE_VARIANT:
-            return QVariant::List;
+            return QMetaType::QVariantList;
 
         case DBUS_TYPE_OBJECT_PATH:
             return qMetaTypeId<QList<QDBusObjectPath> >();
@@ -409,7 +409,7 @@ const char *QDBusMetaType::typeToSignature(int type)
     case QMetaType::UChar:
         return DBUS_TYPE_BYTE_AS_STRING;
 
-    case QVariant::Bool:
+    case QMetaType::Bool:
         return DBUS_TYPE_BOOLEAN_AS_STRING;
 
     case QMetaType::Short:
@@ -418,29 +418,29 @@ const char *QDBusMetaType::typeToSignature(int type)
     case QMetaType::UShort:
         return DBUS_TYPE_UINT16_AS_STRING;
 
-    case QVariant::Int:
+    case QMetaType::Int:
         return DBUS_TYPE_INT32_AS_STRING;
 
-    case QVariant::UInt:
+    case QMetaType::UInt:
         return DBUS_TYPE_UINT32_AS_STRING;
 
-    case QVariant::LongLong:
+    case QMetaType::LongLong:
         return DBUS_TYPE_INT64_AS_STRING;
 
-    case QVariant::ULongLong:
+    case QMetaType::ULongLong:
         return DBUS_TYPE_UINT64_AS_STRING;
 
-    case QVariant::Double:
+    case QMetaType::Double:
         return DBUS_TYPE_DOUBLE_AS_STRING;
 
-    case QVariant::String:
+    case QMetaType::QString:
         return DBUS_TYPE_STRING_AS_STRING;
 
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         return DBUS_TYPE_ARRAY_AS_STRING
             DBUS_TYPE_STRING_AS_STRING; // as
 
-    case QVariant::ByteArray:
+    case QMetaType::QByteArray:
         return DBUS_TYPE_ARRAY_AS_STRING
             DBUS_TYPE_BYTE_AS_STRING; // ay
     }