1 files changed, 16 insertions, 4 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 3b35a51e2c..9c61a67962 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -822,7 +822,14 @@ struct IteratorOwner
 template<typename value_type>
 struct IteratorOwner<const value_type*>
 {
-    static void assign(void **ptr, const value_type *iterator )
+private:
+    // We need to disable typed overloads of assign() and getData() if the value_type
+    // is void* to avoid overloads conflicts. We do it by injecting unaccessible Dummy
+    // type as part of the overload signature.
+    struct Dummy {};
+    typedef typename QtPrivate::if_<QtPrivate::is_same<value_type, void*>::value, Dummy, value_type>::type value_type_OR_Dummy;
+public:
+    static void assign(void **ptr, const value_type_OR_Dummy *iterator )
     {
         *ptr = const_cast<value_type*>(iterator);
     }
@@ -847,7 +854,7 @@ struct IteratorOwner<const value_type*>
         return *iterator;
     }
 
-    static const void *getData(const value_type *it)
+    static const void *getData(const value_type_OR_Dummy *it)
     {
         return it;
     }
@@ -894,11 +901,11 @@ struct ContainerAPI<QVector<T> > : CapabilitiesImpl<QVector<T> >
 
 template<typename T>
 struct ContainerAPI<std::vector<T> > : CapabilitiesImpl<std::vector<T> >
-{ static int size(const std::vector<T> *t) { return t->size(); } };
+{ static int size(const std::vector<T> *t) { return int(t->size()); } };
 
 template<typename T>
 struct ContainerAPI<std::list<T> > : CapabilitiesImpl<std::list<T> >
-{ static int size(const std::list<T> *t) { return t->size(); } };
+{ static int size(const std::list<T> *t) { return int(t->size()); } };
 
 class QSequentialIterableImpl
 {
@@ -1278,6 +1285,11 @@ namespace QtPrivate
         enum { Value = false };
     };
     template<>
+    struct IsPointerToTypeDerivedFromQObject<const void*>
+    {
+        enum { Value = false };
+    };
+    template<>
     struct IsPointerToTypeDerivedFromQObject<QObject*>
     {
         enum { Value = true };