Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main

2 files changed, 3 insertions, 3 deletions

diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp
index b7cbfd0194..bccaacdeb6 100644
--- a/src/control/controlobjectscript.cpp
+++ b/src/control/controlobjectscript.cpp
@@ -66,7 +66,7 @@ bool ControlObjectScript::removeScriptConnection(const ScriptConnection& conn) {
 
 void ControlObjectScript::disconnectAllConnectionsToFunction(const QJSValue& function) {
     // Make a local copy of m_scriptConnections because items are removed within the loop.
-    const QList<ScriptConnection> connections = m_scriptConnections;
+    const QVector<ScriptConnection> connections = m_scriptConnections;
     for (const auto& conn: connections) {
         if (conn.callback.strictlyEquals(function)) {
             removeScriptConnection(conn);
@@ -79,7 +79,7 @@ void ControlObjectScript::slotValueChanged(double value, QObject*) {
     // This allows a script to disconnect a callback from inside the
     // the callback. Otherwise the this may crash since the disconnect call
     // happens during conn.function.call() in the middle of the loop below.
-    const QList<ScriptConnection> connections = m_scriptConnections;
+    const QVector<ScriptConnection> connections = m_scriptConnections;
     for (auto&& conn: connections) {
         conn.executeCallback(value);
     }
diff --git a/src/control/controlobjectscript.h b/src/control/controlobjectscript.h
index acc6d9ceba..9dbd446ab5 100644
--- a/src/control/controlobjectscript.h
+++ b/src/control/controlobjectscript.h
@@ -38,7 +38,7 @@ class ControlObjectScript : public ControlProxy {
     void slotValueChanged(double v, QObject*);
 
   private:
-    QList<ScriptConnection> m_scriptConnections;
+    QVector<ScriptConnection> m_scriptConnections;
 };
 
 #endif // CONTROLOBJECTSCRIPT_H