Update dependencies.yaml and adapt to API changes in qtbase

The evaluation callback does not have to perform the comparison anymore
and the shared pointer of the private is not used in the API anymore.

Also, the versionFunctions() has been moved out of QOpenGLContext
and renamed QOpenGLVersionFunctionsFactory::get().

QHash doesn't keep iterators stable under erase(), so clean up
the code relying on it, and avoid an intermediate QList at the
same time.

Task-number: QTBUG-74409
Change-Id: I90176be1067d88c8f2b1ea07198a06d432f5be9c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 8 insertions, 11 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 2a368eddc2..49b3d7ad93 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1189,8 +1189,8 @@ void QQmlTypeLoader::updateTypeCacheTrimThreshold()
 void QQmlTypeLoader::trimCache()
 {
     while (true) {
-        QList<TypeCache::Iterator> unneededTypes;
-        for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end; ++iter)  {
+        bool deletedOneType = false;
+        for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end;)  {
             QQmlTypeData *typeData = iter.value();
 
             // typeData->m_compiledData may be set early on in the proccess of loading a file, so
@@ -1199,19 +1199,16 @@ void QQmlTypeLoader::trimCache()
             if (typeData->count() == 1 && (typeData->isError() || typeData->isComplete())
                     && (!typeData->m_compiledData || typeData->m_compiledData->count() == 1)) {
                 // There are no live objects of this type
-                unneededTypes.append(iter);
+                iter.value()->release();
+                iter = m_typeCache.erase(iter);
+                deletedOneType = true;
+            } else {
+                ++iter;
             }
         }
 
-        if (unneededTypes.isEmpty())
+        if (!deletedOneType)
             break;
-
-        while (!unneededTypes.isEmpty()) {
-            TypeCache::Iterator iter = unneededTypes.takeLast();
-
-            iter.value()->release();
-            m_typeCache.erase(iter);
-        }
     }
 
     updateTypeCacheTrimThreshold();