Remove QModelIndexList value type, use Array instead

We implement this by adding QModelIndexList to the
set of sequence types.

Change-Id: If7e0e88ab0c2916c2b65a926f8241549520d7391
Reviewed-by: Stephen Kelly <steveire@gmail.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index 2b3f78b676..6711ad2de9 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -64,7 +64,6 @@ QQmlValueTypeFactoryImpl::QQmlValueTypeFactoryImpl()
         valueTypes[ii] = 0;
 
     // See types wrapped in qqmlmodelindexvaluetype_p.h
-    qRegisterMetaType<QModelIndexList>();
     qRegisterMetaType<QItemSelectionRange>();
     qRegisterMetaType<QItemSelection>();
 }
@@ -112,18 +111,16 @@ const QMetaObject *QQmlValueTypeFactoryImpl::metaObjectForMetaType(int t)
     case QVariant::PersistentModelIndex:
         return &QQmlPersistentModelIndexValueType::staticMetaObject;
     default:
+        if (t == qMetaTypeId<QItemSelectionRange>())
+            return &QQmlItemSelectionRangeValueType::staticMetaObject;
+        if (t == qMetaTypeId<QItemSelection>())
+            return &QQmlItemSelectionValueType::staticMetaObject;
+
         if (const QMetaObject *mo = QQml_valueTypeProvider()->metaObjectForMetaType(t))
             return mo;
         break;
     }
 
-    if (t == qMetaTypeId<QModelIndexList>())
-        return &QQmlModelIndexListValueType::staticMetaObject;
-    else if (t == qMetaTypeId<QItemSelectionRange>())
-        return &QQmlItemSelectionRangeValueType::staticMetaObject;
-    else if (t == qMetaTypeId<QItemSelection>())
-        return &QQmlItemSelectionValueType::staticMetaObject;
-
     QMetaType metaType(t);
     if (metaType.flags() & QMetaType::IsGadget)
         return metaType.metaObject();