5 files changed, 8 insertions, 8 deletions
diff --git a/src/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp
index c5c18a201c..e68ea54707 100644
--- a/src/particles/qquickitemparticle.cpp
+++ b/src/particles/qquickitemparticle.cpp
@@ -230,13 +230,13 @@ void QQuickItemParticle::reset()
 
     // delete all managed items which had their logical particles cleared
     // but leave it alone if the logical particle is maintained
-    QSet<QQuickItem*> lost = QSet<QQuickItem*>::fromList(m_managed);
+    QSet<QQuickItem*> lost = QSet<QQuickItem*>(m_managed.cbegin(), m_managed.cend());
     for (auto groupId : groupIds()) {
         for (QQuickParticleData* d : qAsConst(m_system->groupData[groupId]->data)) {
             lost.remove(d->delegate);
         }
     }
-    m_deletables.append(lost.toList());
+    m_deletables.append(lost.values());
     //TODO: This doesn't yet handle calling detach on taken particles in the system reset case
     processDeletables();
 }
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 6aff7af0e7..2b0205cdd4 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -559,7 +559,7 @@ int quick_test_main_with_setup(int argc, char **argv, const char *name, const ch
     // Register the test object
     qmlRegisterSingletonType<QTestRootObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject);
 
-    QSet<QString> commandLineTestFunctions = QTest::testFunctions.toSet();
+    QSet<QString> commandLineTestFunctions(QTest::testFunctions.cbegin(), QTest::testFunctions.cend());
     const bool filteringTestFunctions = !commandLineTestFunctions.isEmpty();
 
     // Scan through all of the "tst_*.qml" files and run each of them
@@ -601,7 +601,7 @@ int quick_test_main_with_setup(int argc, char **argv, const char *name, const ch
             continue;
         }
 
-        const QSet<QString> availableTestSet = availableTestFunctions.toSet();
+        const QSet<QString> availableTestSet(availableTestFunctions.cbegin(), availableTestFunctions.cend());
         if (filteringTestFunctions && !availableTestSet.intersects(commandLineTestFunctions))
             continue;
         commandLineTestFunctions.subtract(availableTestSet);
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp
index 70b74b8877..a5b2b04c93 100644
--- a/src/quick/scenegraph/qsgdefaultcontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultcontext.cpp
@@ -160,7 +160,7 @@ void QSGDefaultContext::renderContextInitialized(QSGRenderContext *renderContext
         qCDebug(QSG_LOG_INFO, "GL_RENDERER:       %s",
                 (const char*)funcs->glGetString(GL_RENDERER));
         qCDebug(QSG_LOG_INFO, "GL_VERSION:        %s", (const char*)funcs->glGetString(GL_VERSION));
-        QByteArrayList exts = openglRenderContext->openglContext()->extensions().toList();
+        QByteArrayList exts = openglRenderContext->openglContext()->extensions().values();
         std::sort(exts.begin(), exts.end());
         qCDebug(QSG_LOG_INFO, "GL_EXTENSIONS:    %s", exts.join(' ').constData());
         qCDebug(QSG_LOG_INFO, "Max Texture Size: %d", openglRenderContext->maxTextureSize());
diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
index 94912778f8..a850f72053 100644
--- a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
+++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
@@ -183,7 +183,7 @@ void QSGDefaultDepthStencilBuffer::free()
 QSGDepthStencilBufferManager::~QSGDepthStencilBufferManager()
 {
     for (Hash::const_iterator it = m_buffers.constBegin(), cend = m_buffers.constEnd(); it != cend; ++it) {
-        QSGDepthStencilBuffer *buffer = it.value().data();
+        QSGDepthStencilBuffer *buffer = it.value().toStrongRef().data();
         buffer->free();
         buffer->m_manager = nullptr;
     }
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 60d725d650..16723b997e 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -570,7 +570,7 @@ void QQuickPath::gatherAttributes()
             attributes.insert(attribute->name());
     }
 
-    d->_attributes = attributes.toList();
+    d->_attributes = attributes.values();
 }
 
 void QQuickPath::componentComplete()
@@ -603,7 +603,7 @@ QStringList QQuickPath::attributes() const
                 qobject_cast<QQuickPathAttribute *>(pathElement))
                 attrs.insert(attribute->name());
         }
-        return attrs.toList();
+        return attrs.values();
     }
     return d->_attributes;
 }