Fix a memleak in QAssociativeIterable::value()

QtMetaTypePrivate::QAssociativeIterableImpl::{find,begin,end}() allocate a new _iterator,
so when they're used outside of the ref-counted world of QAssociativeIterable::const_iterator,
their lifetime needs to be manually managed.

Instead of going to that length, which failed in previous iterations of this patch, implement
value() in terms of (new) find() and let find() operate on const_iterator.

Because of forwards compatibility between patch releases, use (unexported) friend functions
for now with the intention to make them proper member functions come Qt 5.5.

Task-number: QTBUG-41469
Change-Id: I43b21eae0c2fc4c182369e669a8b3b457be68885
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 7dce813bb5..90f3e8fbae 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -633,6 +633,9 @@ public:
 
         void begin();
         void end();
+        // ### Qt 5.5: make find() (1st one) a member function
+        friend void find(const_iterator &it, const QVariant &key);
+        friend const_iterator find(const QAssociativeIterable &iterable, const QVariant &key);
     public:
         ~const_iterator();
         const_iterator(const const_iterator &other);
@@ -662,6 +665,9 @@ public:
 
     const_iterator begin() const;
     const_iterator end() const;
+private: // ### Qt 5.5: make it a public find() member function:
+    friend const_iterator find(const QAssociativeIterable &iterable, const QVariant &key);
+public:
 
     QVariant value(const QVariant &key) const;