Permit value types with metatype IDs >= QMetaType::User

Remove the assumption that value types must be types defined by
Qt, having metatype IDs below QMetaType::User.

Task-number: QTBUG-26352
Change-Id: Ib5a56ff2e7892e82adf17a3a1e7517a0c9fe0534
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

1 files changed, 1 insertions, 21 deletions

diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 153037b248..dd3c9196d3 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -161,30 +161,10 @@ protected:
 class Q_QML_PRIVATE_EXPORT QQmlValueTypeFactory
 {
 public:
-    QQmlValueTypeFactory();
-    ~QQmlValueTypeFactory();
     static bool isValueType(int);
-    static QQmlValueType *valueType(int);
+    static QQmlValueType *valueType(int idx);
 
     static void registerValueTypes(const char *uri, int versionMajor, int versionMinor);
-
-    QQmlValueType *operator[](int idx) const {
-        if (idx >= (int)QVariant::UserType)
-            return 0;
-
-        QQmlValueType *rv = valueTypes[idx];
-        if (!rv) {
-            // Table update is not thread-safe, but the potential for leaks is
-            // so small that the cost of protection is unwarranted
-            if ((rv = valueType(idx))) {
-                valueTypes[idx] = rv;
-            }
-        }
-        return rv;
-    }
-
-private:
-    mutable QQmlValueType *valueTypes[QVariant::UserType];
 };
 
 class Q_QML_PRIVATE_EXPORT QQmlPointFValueType : public QQmlValueTypeBase<QPointF>