Move conversions to and from *Iterables into QMetaType

Those were not yet supported by QMetaType.

Change-Id: I9f85476049f200e35939ac58ef7e8b4e7cbe0b77
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 0 insertions, 21 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index c16e4a0e06..6a046dffd3 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1974,27 +1974,6 @@ bool QVariant::canConvert(int targetTypeId) const
     if (d.typeId() == targetTypeId && targetTypeId != QMetaType::UnknownType)
         return true;
 
-    if (targetTypeId == QMetaType::QVariantList
-        && (d.typeId() == QMetaType::QVariantList || d.typeId() == QMetaType::QStringList
-            || d.typeId() == QMetaType::QByteArrayList
-            || QMetaType::hasRegisteredConverterFunction(
-                    d.typeId(), qMetaTypeId<QtMetaTypePrivate::QSequentialIterableImpl>()))) {
-        return true;
-    }
-
-    if ((targetTypeId == QMetaType::QVariantHash || targetTypeId == QMetaType::QVariantMap)
-        && (d.typeId() == QMetaType::QVariantMap || d.typeId() == QMetaType::QVariantHash
-            || QMetaType::hasRegisteredConverterFunction(
-                    d.typeId(), qMetaTypeId<QtMetaTypePrivate::QAssociativeIterableImpl>()))) {
-        return true;
-    }
-
-    if (targetTypeId == qMetaTypeId<QPair<QVariant, QVariant>>()
-        && QMetaType::hasRegisteredConverterFunction(
-                d.typeId(), qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) {
-        return true;
-    }
-
     return QMetaType::canConvert(d.type(), QMetaType(targetTypeId));
 }