Merge remote-tracking branch 'origin/dev' into new-backend

Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c

1 files changed, 4 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 5db7da668b..049e4a117d 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -470,10 +470,8 @@ ExecutionEngine::~ExecutionEngine()
     delete identifierTable;
     delete memoryManager;
 
-    QSet<QV4::CompiledData::CompilationUnit*> remainingUnits;
-    qSwap(compilationUnits, remainingUnits);
-    for (QV4::CompiledData::CompilationUnit *unit : qAsConst(remainingUnits))
-        unit->unlink();
+    while (!compilationUnits.isEmpty())
+        (*compilationUnits.begin())->unlink();
 
     internalClasses[Class_Empty]->destroy();
     delete classPool;
@@ -918,9 +916,8 @@ void ExecutionEngine::markObjects(MarkStack *markStack)
     classPool->markObjects(markStack);
     markStack->drain();
 
-    for (QSet<CompiledData::CompilationUnit*>::ConstIterator it = compilationUnits.constBegin(), end = compilationUnits.constEnd();
-         it != end; ++it) {
-        (*it)->markObjects(markStack);
+    for (auto compilationUnit: compilationUnits) {
+        compilationUnit->markObjects(markStack);
         markStack->drain();
     }
 }