1 files changed, 46 insertions, 7 deletions

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 3b35a51e2c..32fd5bd153 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -782,7 +782,7 @@ private:
 };
 
 template<typename const_iterator>
-struct IteratorOwner
+struct IteratorOwnerCommon
 {
     static void assign(void **ptr, const_iterator iterator)
     {
@@ -804,6 +804,15 @@ struct IteratorOwner
         delete static_cast<const_iterator*>(*ptr);
     }
 
+    static bool equal(void * const *it, void * const *other)
+    {
+        return *static_cast<const_iterator*>(*it) == *static_cast<const_iterator*>(*other);
+    }
+};
+
+template<typename const_iterator>
+struct IteratorOwner : IteratorOwnerCommon<const_iterator>
+{
     static const void *getData(void * const *iterator)
     {
         return &**static_cast<const_iterator*>(*iterator);
@@ -813,16 +822,41 @@ struct IteratorOwner
     {
         return &*it;
     }
+};
 
-    static bool equal(void * const *it, void * const *other)
+struct Q_CORE_EXPORT VectorBoolElements
+{
+  static const bool true_element;
+  static const bool false_element;
+};
+
+template<>
+struct IteratorOwner<std::vector<bool>::const_iterator> : IteratorOwnerCommon<std::vector<bool>::const_iterator>
+{
+public:
+    static const void *getData(void * const *iterator)
     {
-        return *static_cast<const_iterator*>(*it) == *static_cast<const_iterator*>(*other);
+        return **static_cast<std::vector<bool>::const_iterator*>(*iterator) ?
+            &VectorBoolElements::true_element : &VectorBoolElements::false_element;
+    }
+
+    static const void *getData(const std::vector<bool>::const_iterator& it)
+    {
+        return *it ? &VectorBoolElements::true_element : &VectorBoolElements::false_element;
     }
 };
+
 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 +881,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 +928,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 +1312,11 @@ namespace QtPrivate
         enum { Value = false };
     };
     template<>
+    struct IsPointerToTypeDerivedFromQObject<const void*>
+    {
+        enum { Value = false };
+    };
+    template<>
     struct IsPointerToTypeDerivedFromQObject<QObject*>
     {
         enum { Value = true };