QmlPuppet: Replace QVector with QList and clean up includes

QVector is only a type alias, QList the real thing in Qt 6.

Change-Id: I61070fa42ce349808717d0c225a4cbe99584dcc8
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

src/libs/qmlpuppetcommunication/commands/captureddatacommand.h

@@ -131,7 +131,7 @@ public:
 
     CapturedDataCommand() = default;
 
-    CapturedDataCommand(QVector<StateData> &&stateData)
+    CapturedDataCommand(QList<StateData> &&stateData)
         : stateData{std::move(stateData)}
     {}
 
@@ -157,7 +157,7 @@ public:
 
 public:
     QImage image;
-    QVector<StateData> stateData;
+    QList<StateData> stateData;
 };
 
 } // namespace QmlDesigner

src/libs/qmlpuppetcommunication/commands/changeauxiliarycommand.h

@@ -5,8 +5,8 @@
 
 #include <QDataStream>
 #include <QDebug>
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "propertyvaluecontainer.h"
 
@@ -29,7 +29,7 @@ public:
 
     friend QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command);
 
-    QVector<PropertyValueContainer> auxiliaryChanges;
+    QList<PropertyValueContainer> auxiliaryChanges;
 };
 
 } // namespace QmlDesigner

src/libs/qmlpuppetcommunication/commands/changebindingscommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "propertybindingcontainer.h"
 
@@ -25,7 +25,7 @@ public:
 
     friend QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
 
-    QVector<PropertyBindingContainer> bindingChanges;
+    QList<PropertyBindingContainer> bindingChanges;
 };
 
 } // namespace QmlDesigner

src/libs/qmlpuppetcommunication/commands/changeidscommand.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <QMetaType>
-#include <QVector>
+#include <QList>
 #include <QDataStream>
 
 #include "idcontainer.h"
@@ -27,7 +27,7 @@ public:
     }
     friend QDebug operator <<(QDebug debug, const ChangeIdsCommand &command);
 
-    QVector<IdContainer> ids;
+    QList<IdContainer> ids;
 };
 
 } // namespace QmlDesigner

src/libs/qmlpuppetcommunication/commands/changeselectioncommand.cpp

@@ -10,12 +10,12 @@ namespace QmlDesigner {
 
 ChangeSelectionCommand::ChangeSelectionCommand() = default;
 
-ChangeSelectionCommand::ChangeSelectionCommand(const QVector<qint32> &idVector)
+ChangeSelectionCommand::ChangeSelectionCommand(const QList<qint32> &idVector)
     : m_instanceIdVector(idVector)
 {
 }
 
-QVector<qint32> ChangeSelectionCommand::instanceIds() const
+QList<qint32> ChangeSelectionCommand::instanceIds() const
 {
     return m_instanceIdVector;
 }

src/libs/qmlpuppetcommunication/commands/changeselectioncommand.h

@@ -3,12 +3,10 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 #include <QDataStream>
 
-#include "instancecontainer.h"
-
 namespace QmlDesigner {
 
 class ChangeSelectionCommand
@@ -20,12 +18,12 @@ class ChangeSelectionCommand
 
 public:
     ChangeSelectionCommand();
-    explicit ChangeSelectionCommand(const QVector<qint32> &idVector);
+    explicit ChangeSelectionCommand(const QList<qint32> &idVector);
 
-    QVector<qint32> instanceIds() const;
+    QList<qint32> instanceIds() const;
 
 private:
-    QVector<qint32> m_instanceIdVector;
+    QList<qint32> m_instanceIdVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const ChangeSelectionCommand &command);

src/libs/qmlpuppetcommunication/commands/changestatecommand.h

@@ -3,10 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
-
-#include "propertyvaluecontainer.h"
 
 namespace QmlDesigner {
 

src/libs/qmlpuppetcommunication/commands/changevaluescommand.cpp

@@ -9,12 +9,12 @@ namespace QmlDesigner {
 
 ChangeValuesCommand::ChangeValuesCommand() = default;
 
-ChangeValuesCommand::ChangeValuesCommand(const QVector<PropertyValueContainer> &valueChangeVector)
+ChangeValuesCommand::ChangeValuesCommand(const QList<PropertyValueContainer> &valueChangeVector)
     : m_valueChangeVector (valueChangeVector)
 {
 }
 
-const QVector<PropertyValueContainer> ChangeValuesCommand::valueChanges() const
+const QList<PropertyValueContainer> ChangeValuesCommand::valueChanges() const
 {
     return m_valueChangeVector;
 }

src/libs/qmlpuppetcommunication/commands/changevaluescommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "propertyvaluecontainer.h"
 
@@ -17,12 +17,12 @@ class ChangeValuesCommand
 
 public:
     ChangeValuesCommand();
-    explicit ChangeValuesCommand(const QVector<PropertyValueContainer> &valueChangeVector);
+    explicit ChangeValuesCommand(const QList<PropertyValueContainer> &valueChangeVector);
 
-    const QVector<PropertyValueContainer> valueChanges() const;
+    const QList<PropertyValueContainer> valueChanges() const;
 
 private:
-    QVector<PropertyValueContainer> m_valueChangeVector;
+    QList<PropertyValueContainer> m_valueChangeVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const ChangeValuesCommand &command);

src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.cpp

@@ -14,14 +14,14 @@ ChildrenChangedCommand::ChildrenChangedCommand()
 {
 }
 
-ChildrenChangedCommand::ChildrenChangedCommand(qint32 parentInstanceId, const QVector<qint32> &children, const QVector<InformationContainer> &informationVector)
+ChildrenChangedCommand::ChildrenChangedCommand(qint32 parentInstanceId, const QList<qint32> &children, const QList<InformationContainer> &informationVector)
     : m_parentInstanceId(parentInstanceId),
       m_childrenVector(children),
       m_informationVector(informationVector)
 {
 }
 
-QVector<qint32> ChildrenChangedCommand::childrenInstances() const
+QList<qint32> ChildrenChangedCommand::childrenInstances() const
 {
     return m_childrenVector;
 }
@@ -31,7 +31,7 @@ qint32 ChildrenChangedCommand::parentInstanceId() const
     return m_parentInstanceId;
 }
 
-QVector<InformationContainer> ChildrenChangedCommand::informations() const
+QList<InformationContainer> ChildrenChangedCommand::informations() const
 {
     return m_informationVector;
 }

src/libs/qmlpuppetcommunication/commands/childrenchangedcommand.h

@@ -3,8 +3,9 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
+
 #include "informationcontainer.h"
 
 namespace QmlDesigner {
@@ -16,18 +17,18 @@ class ChildrenChangedCommand
 
 public:
     ChildrenChangedCommand();
-    explicit ChildrenChangedCommand(qint32 parentInstanceId, const QVector<qint32> &childrenInstancesconst, const QVector<InformationContainer> &informationVector);
+    explicit ChildrenChangedCommand(qint32 parentInstanceId, const QList<qint32> &childrenInstancesconst, const QList<InformationContainer> &informationVector);
 
-    QVector<qint32> childrenInstances() const;
+    QList<qint32> childrenInstances() const;
     qint32 parentInstanceId() const;
-    QVector<InformationContainer> informations() const;
+    QList<InformationContainer> informations() const;
 
     void sort();
 
 private:
     qint32 m_parentInstanceId;
-    QVector<qint32> m_childrenVector;
-    QVector<InformationContainer> m_informationVector;
+    QList<qint32> m_childrenVector;
+    QList<InformationContainer> m_informationVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const ChildrenChangedCommand &command);

src/libs/qmlpuppetcommunication/commands/completecomponentcommand.cpp

@@ -10,12 +10,12 @@ namespace QmlDesigner {
 
 CompleteComponentCommand::CompleteComponentCommand() = default;
 
-CompleteComponentCommand::CompleteComponentCommand(const QVector<qint32> &container)
+CompleteComponentCommand::CompleteComponentCommand(const QList<qint32> &container)
     : m_instanceVector(container)
 {
 }
 
-const QVector<qint32> CompleteComponentCommand::instances() const
+const QList<qint32> CompleteComponentCommand::instances() const
 {
     return m_instanceVector;
 }

src/libs/qmlpuppetcommunication/commands/completecomponentcommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 #include <QDataStream>
 
 namespace QmlDesigner {
@@ -16,12 +16,12 @@ class CompleteComponentCommand
 
 public:
     CompleteComponentCommand();
-    explicit CompleteComponentCommand(const QVector<qint32> &container);
+    explicit CompleteComponentCommand(const QList<qint32> &container);
 
-    const QVector<qint32> instances() const;
+    const QList<qint32> instances() const;
 
 private:
-    QVector<qint32> m_instanceVector;
+    QList<qint32> m_instanceVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const CompleteComponentCommand &command);

src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.cpp

@@ -12,12 +12,12 @@ namespace QmlDesigner {
 
 ComponentCompletedCommand::ComponentCompletedCommand() = default;
 
-ComponentCompletedCommand::ComponentCompletedCommand(const QVector<qint32> &container)
+ComponentCompletedCommand::ComponentCompletedCommand(const QList<qint32> &container)
     : m_instanceVector(container)
 {
 }
 
-QVector<qint32> ComponentCompletedCommand::instances() const
+QList<qint32> ComponentCompletedCommand::instances() const
 {
     return m_instanceVector;
 }

src/libs/qmlpuppetcommunication/commands/componentcompletedcommand.h

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
+
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 #include <QDataStream>
 
 namespace QmlDesigner {
@@ -15,14 +16,14 @@ class ComponentCompletedCommand
 
 public:
     ComponentCompletedCommand();
-    explicit ComponentCompletedCommand(const QVector<qint32> &container);
+    explicit ComponentCompletedCommand(const QList<qint32> &container);
 
-    QVector<qint32> instances() const;
+    QList<qint32> instances() const;
 
     void sort();
 
 private:
-    QVector<qint32> m_instanceVector;
+    QList<qint32> m_instanceVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const ComponentCompletedCommand &command);

src/libs/qmlpuppetcommunication/commands/createinstancescommand.cpp

@@ -10,12 +10,12 @@ namespace QmlDesigner {
 
 CreateInstancesCommand::CreateInstancesCommand() = default;
 
-CreateInstancesCommand::CreateInstancesCommand(const QVector<InstanceContainer> &container)
+CreateInstancesCommand::CreateInstancesCommand(const QList<InstanceContainer> &container)
     : m_instanceVector(container)
 {
 }
 
-QVector<InstanceContainer> CreateInstancesCommand::instances() const
+QList<InstanceContainer> CreateInstancesCommand::instances() const
 {
     return m_instanceVector;
 }

src/libs/qmlpuppetcommunication/commands/createinstancescommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "instancecontainer.h"
 
@@ -16,12 +16,12 @@ class CreateInstancesCommand
 
 public:
     CreateInstancesCommand();
-    explicit CreateInstancesCommand(const QVector<InstanceContainer> &container);
+    explicit CreateInstancesCommand(const QList<InstanceContainer> &container);
 
-    QVector<InstanceContainer> instances() const;
+    QList<InstanceContainer> instances() const;
 
 private:
-    QVector<InstanceContainer> m_instanceVector;
+    QList<InstanceContainer> m_instanceVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const CreateInstancesCommand &command);

src/libs/qmlpuppetcommunication/commands/createscenecommand.h

@@ -3,12 +3,11 @@
 
 #pragma once
 
+#include <QColor>
+#include <QList>
+#include <QMetaType>
 #include <QSize>
 #include <QUrl>
-#include <QVector>
-#include <QList>
-#include <QColor>
-#include <qmetatype.h>
 
 #include "instancecontainer.h"
 #include "reparentcontainer.h"
@@ -24,14 +23,14 @@ class CreateSceneCommand
 {
 public:
     CreateSceneCommand() = default;
-    explicit CreateSceneCommand(const QVector<InstanceContainer> &instanceContainer,
-                                const QVector<ReparentContainer> &reparentContainer,
-                                const QVector<IdContainer> &idVector,
-                                const QVector<PropertyValueContainer> &valueChangeVector,
-                                const QVector<PropertyBindingContainer> &bindingChangeVector,
-                                const QVector<PropertyValueContainer> &auxiliaryChangeVector,
-                                const QVector<AddImportContainer> &importVector,
-                                const QVector<MockupTypeContainer> &mockupTypeVector,
+    explicit CreateSceneCommand(const QList<InstanceContainer> &instanceContainer,
+                                const QList<ReparentContainer> &reparentContainer,
+                                const QList<IdContainer> &idVector,
+                                const QList<PropertyValueContainer> &valueChangeVector,
+                                const QList<PropertyBindingContainer> &bindingChangeVector,
+                                const QList<PropertyValueContainer> &auxiliaryChangeVector,
+                                const QList<AddImportContainer> &importVector,
+                                const QList<MockupTypeContainer> &mockupTypeVector,
                                 const QUrl &fileUrl,
                                 const QUrl &resourceUrl,
                                 const QHash<QString, QVariantMap> &edit3dToolStates,
@@ -91,14 +90,14 @@ public:
     }
 
 public:
-    QVector<InstanceContainer> instances;
-    QVector<ReparentContainer> reparentInstances;
-    QVector<IdContainer> ids;
-    QVector<PropertyValueContainer> valueChanges;
-    QVector<PropertyBindingContainer> bindingChanges;
-    QVector<PropertyValueContainer> auxiliaryChanges;
-    QVector<AddImportContainer> imports;
-    QVector<MockupTypeContainer> mockupTypes;
+    QList<InstanceContainer> instances;
+    QList<ReparentContainer> reparentInstances;
+    QList<IdContainer> ids;
+    QList<PropertyValueContainer> valueChanges;
+    QList<PropertyBindingContainer> bindingChanges;
+    QList<PropertyValueContainer> auxiliaryChanges;
+    QList<AddImportContainer> imports;
+    QList<MockupTypeContainer> mockupTypes;
     QUrl fileUrl;
     QUrl resourceUrl;
     QHash<QString, QVariantMap> edit3dToolStates;

src/libs/qmlpuppetcommunication/commands/debugoutputcommand.cpp

@@ -9,7 +9,7 @@ namespace QmlDesigner {
 
 DebugOutputCommand::DebugOutputCommand() = default;
 
-DebugOutputCommand::DebugOutputCommand(const QString &text, DebugOutputCommand::Type type, const QVector<qint32> &instanceIds)
+DebugOutputCommand::DebugOutputCommand(const QString &text, DebugOutputCommand::Type type, const QList<qint32> &instanceIds)
     : m_instanceIds(instanceIds)
     , m_text(text)
     , m_type(type)
@@ -26,7 +26,7 @@ QString DebugOutputCommand::text() const
     return m_text;
 }
 
-QVector<qint32> DebugOutputCommand::instanceIds() const
+QList<qint32> DebugOutputCommand::instanceIds() const
 {
     return m_instanceIds;
 }

src/libs/qmlpuppetcommunication/commands/debugoutputcommand.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
+#include <QList>
+#include <QDataStream>
 #include <QMetaType>
 #include <QString>
-#include <QDataStream>
-#include <QVector>
 
 namespace QmlDesigner {
 
@@ -24,14 +24,14 @@ public:
     };
 
     DebugOutputCommand();
-    explicit DebugOutputCommand(const QString &text, Type type, const QVector<qint32> &instanceIds);
+    explicit DebugOutputCommand(const QString &text, Type type, const QList<qint32> &instanceIds);
 
     qint32 type() const;
     QString text() const;
-    QVector<qint32> instanceIds() const;
+    QList<qint32> instanceIds() const;
 
 private:
-    QVector<qint32> m_instanceIds;
+    QList<qint32> m_instanceIds;
     QString m_text;
     quint32 m_type;
 };

src/libs/qmlpuppetcommunication/commands/informationchangedcommand.cpp

@@ -6,20 +6,18 @@
 #include <QMetaType>
 #include <QtDebug>
 
-#include "propertyvaluecontainer.h"
-
 #include <algorithm>
 
 namespace QmlDesigner {
 
 InformationChangedCommand::InformationChangedCommand() = default;
 
-InformationChangedCommand::InformationChangedCommand(const QVector<InformationContainer> &informationVector)
+InformationChangedCommand::InformationChangedCommand(const QList<InformationContainer> &informationVector)
     : m_informationVector(informationVector)
 {
 }
 
-QVector<InformationContainer> InformationChangedCommand::informations() const
+QList<InformationContainer> InformationChangedCommand::informations() const
 {
     return m_informationVector;
 }

src/libs/qmlpuppetcommunication/commands/informationchangedcommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "informationcontainer.h"
 
@@ -17,14 +17,14 @@ class InformationChangedCommand
 
 public:
     InformationChangedCommand();
-    explicit InformationChangedCommand(const QVector<InformationContainer> &informationVector);
+    explicit InformationChangedCommand(const QList<InformationContainer> &informationVector);
 
-    QVector<InformationContainer> informations() const;
+    QList<InformationContainer> informations() const;
 
     void sort();
 
 private:
-    QVector<InformationContainer> m_informationVector;
+    QList<InformationContainer> m_informationVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const InformationChangedCommand &command);

src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.cpp

@@ -13,12 +13,12 @@ namespace QmlDesigner {
 
 PixmapChangedCommand::PixmapChangedCommand() = default;
 
-PixmapChangedCommand::PixmapChangedCommand(const QVector<ImageContainer> &imageVector)
+PixmapChangedCommand::PixmapChangedCommand(const QList<ImageContainer> &imageVector)
     : m_imageVector(imageVector)
 {
 }
 
-QVector<ImageContainer> PixmapChangedCommand::images() const
+QList<ImageContainer> PixmapChangedCommand::images() const
 {
     return m_imageVector;
 }

src/libs/qmlpuppetcommunication/commands/pixmapchangedcommand.h

@@ -15,14 +15,14 @@ class PixmapChangedCommand
 
 public:
     PixmapChangedCommand();
-    explicit PixmapChangedCommand(const QVector<ImageContainer> &imageVector);
+    explicit PixmapChangedCommand(const QList<ImageContainer> &imageVector);
 
-    QVector<ImageContainer> images() const;
+    QList<ImageContainer> images() const;
 
     void sort();
 
 private:
-    QVector<ImageContainer> m_imageVector;
+    QList<ImageContainer> m_imageVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const PixmapChangedCommand &command);

src/libs/qmlpuppetcommunication/commands/removeinstancescommand.cpp

@@ -10,12 +10,12 @@ namespace QmlDesigner {
 
 RemoveInstancesCommand::RemoveInstancesCommand() = default;
 
-RemoveInstancesCommand::RemoveInstancesCommand(const QVector<qint32> &idVector)
+RemoveInstancesCommand::RemoveInstancesCommand(const QList<qint32> &idVector)
     : m_instanceIdVector(idVector)
 {
 }
 
-const QVector<qint32> RemoveInstancesCommand::instanceIds() const
+const QList<qint32> RemoveInstancesCommand::instanceIds() const
 {
     return m_instanceIdVector;
 }

src/libs/qmlpuppetcommunication/commands/removeinstancescommand.h

@@ -3,11 +3,9 @@
 
 #pragma once
 
-#include <QMetaType>
-#include <QVector>
 #include <QDataStream>
-
-#include "instancecontainer.h"
+#include <QList>
+#include <QMetaType>
 
 namespace QmlDesigner {
 
@@ -18,12 +16,12 @@ class RemoveInstancesCommand
 
 public:
     RemoveInstancesCommand();
-    explicit RemoveInstancesCommand(const QVector<qint32> &idVector);
+    explicit RemoveInstancesCommand(const QList<qint32> &idVector);
 
-    const QVector<qint32> instanceIds() const;
+    const QList<qint32> instanceIds() const;
 
 private:
-    QVector<qint32> m_instanceIdVector;
+    QList<qint32> m_instanceIdVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const RemoveInstancesCommand &command);

src/libs/qmlpuppetcommunication/commands/removepropertiescommand.cpp

@@ -9,12 +9,12 @@ namespace QmlDesigner {
 
 RemovePropertiesCommand::RemovePropertiesCommand() = default;
 
-RemovePropertiesCommand::RemovePropertiesCommand(const QVector<PropertyAbstractContainer> &properties)
+RemovePropertiesCommand::RemovePropertiesCommand(const QList<PropertyAbstractContainer> &properties)
     : m_properties(properties)
 {
 }
 
-const QVector<PropertyAbstractContainer> RemovePropertiesCommand::properties() const
+const QList<PropertyAbstractContainer> RemovePropertiesCommand::properties() const
 {
     return m_properties;
 }

src/libs/qmlpuppetcommunication/commands/removepropertiescommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "propertyabstractcontainer.h"
 
@@ -17,12 +17,12 @@ class RemovePropertiesCommand
 
 public:
     RemovePropertiesCommand();
-    explicit RemovePropertiesCommand(const QVector<PropertyAbstractContainer> &properties);
+    explicit RemovePropertiesCommand(const QList<PropertyAbstractContainer> &properties);
 
-    const QVector<PropertyAbstractContainer> properties() const;
+    const QList<PropertyAbstractContainer> properties() const;
 
 private:
-    QVector<PropertyAbstractContainer> m_properties;
+    QList<PropertyAbstractContainer> m_properties;
 };
 
 QDataStream &operator<<(QDataStream &out, const RemovePropertiesCommand &command);

src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.cpp

@@ -10,7 +10,7 @@ namespace QmlDesigner {
 
 RemoveSharedMemoryCommand::RemoveSharedMemoryCommand() = default;
 
-RemoveSharedMemoryCommand::RemoveSharedMemoryCommand(const QString &typeName, const QVector<qint32> &keyNumberVector)
+RemoveSharedMemoryCommand::RemoveSharedMemoryCommand(const QString &typeName, const QList<qint32> &keyNumberVector)
     : m_typeName(typeName),
       m_keyNumberVector(keyNumberVector)
 {
@@ -21,7 +21,7 @@ QString RemoveSharedMemoryCommand::typeName() const
     return m_typeName;
 }
 
-QVector<qint32> RemoveSharedMemoryCommand::keyNumbers() const
+QList<qint32> RemoveSharedMemoryCommand::keyNumbers() const
 {
     return m_keyNumberVector;
 }

src/libs/qmlpuppetcommunication/commands/removesharedmemorycommand.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
 #include <QString>
-#include <QVector>
 
 namespace QmlDesigner {
 
@@ -16,14 +16,14 @@ class RemoveSharedMemoryCommand
 
 public:
     RemoveSharedMemoryCommand();
-    explicit RemoveSharedMemoryCommand(const QString &typeName, const QVector<qint32> &keyNumberVector);
+    explicit RemoveSharedMemoryCommand(const QString &typeName, const QList<qint32> &keyNumberVector);
 
     QString typeName() const;
-    QVector<qint32> keyNumbers() const;
+    QList<qint32> keyNumbers() const;
 
 private:
     QString m_typeName;
-    QVector<qint32> m_keyNumberVector;
+    QList<qint32> m_keyNumberVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const RemoveSharedMemoryCommand &command);

src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.cpp

@@ -10,12 +10,12 @@ namespace QmlDesigner {
 
 ReparentInstancesCommand::ReparentInstancesCommand() = default;
 
-ReparentInstancesCommand::ReparentInstancesCommand(const QVector<ReparentContainer> &container)
+ReparentInstancesCommand::ReparentInstancesCommand(const QList<ReparentContainer> &container)
     : m_reparentInstanceVector(container)
 {
 }
 
-const QVector<ReparentContainer> ReparentInstancesCommand::reparentInstances() const
+const QList<ReparentContainer> ReparentInstancesCommand::reparentInstances() const
 {
     return m_reparentInstanceVector;
 }

src/libs/qmlpuppetcommunication/commands/reparentinstancescommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "reparentcontainer.h"
 
@@ -17,12 +17,12 @@ class ReparentInstancesCommand
 
 public:
     ReparentInstancesCommand();
-    explicit ReparentInstancesCommand(const QVector<ReparentContainer> &container);
+    explicit ReparentInstancesCommand(const QList<ReparentContainer> &container);
 
-    const QVector<ReparentContainer> reparentInstances() const;
+    const QList<ReparentContainer> reparentInstances() const;
 
 private:
-    QVector<ReparentContainer> m_reparentInstanceVector;
+    QList<ReparentContainer> m_reparentInstanceVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const ReparentInstancesCommand &command);

src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.cpp

@@ -11,12 +11,12 @@ namespace QmlDesigner {
 
 StatePreviewImageChangedCommand::StatePreviewImageChangedCommand() = default;
 
-StatePreviewImageChangedCommand::StatePreviewImageChangedCommand(const QVector<ImageContainer> &imageVector)
+StatePreviewImageChangedCommand::StatePreviewImageChangedCommand(const QList<ImageContainer> &imageVector)
     : m_previewVector(imageVector)
 {
 }
 
-QVector<ImageContainer> StatePreviewImageChangedCommand::previews()const
+QList<ImageContainer> StatePreviewImageChangedCommand::previews() const
 {
     return m_previewVector;
 }

src/libs/qmlpuppetcommunication/commands/statepreviewimagechangedcommand.h

@@ -16,14 +16,14 @@ class StatePreviewImageChangedCommand
 
 public:
     StatePreviewImageChangedCommand();
-    explicit StatePreviewImageChangedCommand(const QVector<ImageContainer> &imageVector);
+    explicit StatePreviewImageChangedCommand(const QList<ImageContainer> &imageVector);
 
-    QVector<ImageContainer> previews() const;
+    QList<ImageContainer> previews() const;
 
     void sort();
 
 private:
-    QVector<ImageContainer> m_previewVector;
+    QList<ImageContainer> m_previewVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const StatePreviewImageChangedCommand &command);

src/libs/qmlpuppetcommunication/commands/synchronizecommand.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #include <QDebug>
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 namespace QmlDesigner {
 

src/libs/qmlpuppetcommunication/commands/tokencommand.cpp

@@ -15,7 +15,7 @@ TokenCommand::TokenCommand()
 {
 }
 
-TokenCommand::TokenCommand(const QString &tokenName, qint32 tokenNumber, const QVector<qint32> &instanceIdVector)
+TokenCommand::TokenCommand(const QString &tokenName, qint32 tokenNumber, const QList<qint32> &instanceIdVector)
     : m_tokenName(tokenName),
       m_tokenNumber(tokenNumber),
       m_instanceIdVector(instanceIdVector)
@@ -32,7 +32,7 @@ qint32 TokenCommand::tokenNumber() const
     return m_tokenNumber;
 }
 
-QVector<qint32> TokenCommand::instances() const
+QList<qint32> TokenCommand::instances() const
 {
     return m_instanceIdVector;
 }

src/libs/qmlpuppetcommunication/commands/tokencommand.h

@@ -3,11 +3,10 @@
 
 #pragma once
 
-
-#include <QMetaType>
-#include <QVector>
-#include <QString>
 #include <QDataStream>
+#include <QList>
+#include <QMetaType>
+#include <QString>
 
 namespace QmlDesigner {
 
@@ -18,18 +17,18 @@ class TokenCommand
 
 public:
     TokenCommand();
-    explicit TokenCommand(const QString &tokenName, qint32 tokenNumber, const QVector<qint32> &instances);
+    explicit TokenCommand(const QString &tokenName, qint32 tokenNumber, const QList<qint32> &instances);
 
     QString tokenName() const;
     qint32 tokenNumber() const;
-    QVector<qint32> instances() const;
+    QList<qint32> instances() const;
 
     void sort();
 
 private:
     QString m_tokenName;
     qint32 m_tokenNumber;
-    QVector<qint32> m_instanceIdVector;
+    QList<qint32> m_instanceIdVector;
 };
 
 QDataStream &operator<<(QDataStream &out, const TokenCommand &command);

src/libs/qmlpuppetcommunication/commands/valueschangedcommand.cpp

@@ -24,13 +24,13 @@ ValuesChangedCommand::ValuesChangedCommand()
 {
 }
 
-ValuesChangedCommand::ValuesChangedCommand(const QVector<PropertyValueContainer> &valueChangeVector)
+ValuesChangedCommand::ValuesChangedCommand(const QList<PropertyValueContainer> &valueChangeVector)
     : m_valueChangeVector (valueChangeVector),
       m_keyNumber(0)
 {
 }
 
-const QVector<PropertyValueContainer> ValuesChangedCommand::valueChanges() const
+const QList<PropertyValueContainer> ValuesChangedCommand::valueChanges() const
 {
     return m_valueChangeVector;
 }
@@ -40,7 +40,7 @@ quint32 ValuesChangedCommand::keyNumber() const
     return m_keyNumber;
 }
 
-void ValuesChangedCommand::removeSharedMemorys(const QVector<qint32> &keyNumberVector)
+void ValuesChangedCommand::removeSharedMemorys(const QList<qint32> &keyNumberVector)
 {
     for (qint32 keyNumber : keyNumberVector) {
         SharedMemory *sharedMemory = globalSharedMemoryContainer()->take(keyNumber);
@@ -75,7 +75,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command)
 {
     static const bool dontUseSharedMemory = qEnvironmentVariableIsSet("DESIGNER_DONT_USE_SHARED_MEMORY");
 
-    QVector<PropertyValueContainer> propertyValueContainer = command.valueChanges();
+    QList<PropertyValueContainer> propertyValueContainer = command.valueChanges();
 
     if (command.transactionOption != ValuesChangedCommand::TransactionOption::None) {
         PropertyValueContainer optionContainer(command.transactionOption);
@@ -114,7 +114,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command)
     return out;
 }
 
-void readSharedMemory(qint32 key, QVector<PropertyValueContainer> *valueChangeVector)
+void readSharedMemory(qint32 key, QList<PropertyValueContainer> *valueChangeVector)
 {
     SharedMemory sharedMemory(QString(valueKeyTemplateString).arg(key));
     bool canAttach = sharedMemory.attach(QSharedMemory::ReadOnly);
@@ -135,7 +135,7 @@ QDataStream &operator>>(QDataStream &in, ValuesChangedCommand &command)
 {
     in >> command.m_keyNumber;
 
-    QVector<PropertyValueContainer> valueChangeVector;
+    QList<PropertyValueContainer> valueChangeVector;
 
     if (command.keyNumber() > 0)
         readSharedMemory(command.keyNumber(), &valueChangeVector);

src/libs/qmlpuppetcommunication/commands/valueschangedcommand.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QMetaType>
-#include <QVector>
 
 #include "propertyvaluecontainer.h"
 
@@ -19,18 +19,18 @@ class ValuesChangedCommand
 public:
     enum TransactionOption { Start = 1, End = 2, None = 0 };
     ValuesChangedCommand();
-    explicit ValuesChangedCommand(const QVector<PropertyValueContainer> &valueChangeVector);
+    explicit ValuesChangedCommand(const QList<PropertyValueContainer> &valueChangeVector);
 
-    const QVector<PropertyValueContainer> valueChanges() const;
+    const QList<PropertyValueContainer> valueChanges() const;
     quint32 keyNumber() const;
 
-    static void removeSharedMemorys(const QVector<qint32> &keyNumberVector);
+    static void removeSharedMemorys(const QList<qint32> &keyNumberVector);
 
     void sort();
     TransactionOption transactionOption = TransactionOption::None;
 
 private:
-    QVector<PropertyValueContainer> m_valueChangeVector;
+    QList<PropertyValueContainer> m_valueChangeVector;
     mutable quint32 m_keyNumber;
 };
 
@@ -51,7 +51,7 @@ class ValuesModifiedCommand : public ValuesChangedCommand
 public:
     ValuesModifiedCommand() = default;
 
-    explicit ValuesModifiedCommand(const QVector<PropertyValueContainer> &valueChangeVector)
+    explicit ValuesModifiedCommand(const QList<PropertyValueContainer> &valueChangeVector)
         : ValuesChangedCommand(valueChangeVector)
     {}
 };

src/libs/qmlpuppetcommunication/container/idcontainer.h

@@ -4,10 +4,9 @@
 #pragma once
 
 #include <QDataStream>
-#include <qmetatype.h>
+#include <QMetaType>
 #include <QString>
 
-
 namespace QmlDesigner {
 
 class IdContainer

src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp

@@ -182,7 +182,7 @@ NodeInstanceServer::~NodeInstanceServer()
     m_objectInstanceHash.clear();
 }
 
-QList<ServerNodeInstance> NodeInstanceServer::createInstances(const QVector<InstanceContainer> &containerVector)
+QList<ServerNodeInstance> NodeInstanceServer::createInstances(const QList<InstanceContainer> &containerVector)
 {
     Q_ASSERT(declarativeView() || quickWindow());
     QList<ServerNodeInstance> instanceList;
@@ -349,7 +349,7 @@ void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command)
     if (activeStateInstance().isValid())
         activeStateInstance().deactivateState();
 
-    const QVector<qint32> instanceIds = command.instanceIds();
+    const QList<qint32> instanceIds = command.instanceIds();
     for (qint32 instanceId : instanceIds)
         removeInstanceRelationsip(instanceId);
 
@@ -363,7 +363,7 @@ void NodeInstanceServer::removeInstances(const RemoveInstancesCommand &command)
 void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command)
 {
     bool hasDynamicProperties = false;
-    const QVector<PropertyAbstractContainer> props = command.properties();
+    const QList<PropertyAbstractContainer> props = command.properties();
     for (const PropertyAbstractContainer &container : props) {
         hasDynamicProperties |= container.isDynamic();
         resetInstanceProperty(container);
@@ -375,7 +375,7 @@ void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command
     startRenderTimer();
 }
 
-void NodeInstanceServer::reparentInstances(const QVector<ReparentContainer> &containerVector)
+void NodeInstanceServer::reparentInstances(const QList<ReparentContainer> &containerVector)
 {
     for (const ReparentContainer &container : containerVector) {
         if (hasInstanceForId(container.instanceId())) {
@@ -418,7 +418,7 @@ void NodeInstanceServer::completeComponent(const CompleteComponentCommand &comma
 {
     QList<ServerNodeInstance> instanceList;
 
-    const QVector<qint32> instanceIds = command.instances();
+    const QList<qint32> instanceIds = command.instances();
     for (qint32 instanceId : instanceIds) {
         if (hasInstanceForId(instanceId)) {
             ServerNodeInstance instance = instanceForId(instanceId);
@@ -449,7 +449,7 @@ void NodeInstanceServer::removeSharedMemory(const RemoveSharedMemoryCommand &/*c
 {
 }
 
-void NodeInstanceServer::setupImports(const QVector<AddImportContainer> &containerVector)
+void NodeInstanceServer::setupImports(const QList<AddImportContainer> &containerVector)
 {
     Q_ASSERT(quickWindow());
     QSet<QString> importStatementSet;
@@ -622,7 +622,7 @@ void NodeInstanceServer::changeFileUrl(const ChangeFileUrlCommand &command)
 void NodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command)
 {
     bool hasDynamicProperties = false;
-    const QVector<PropertyValueContainer> valueChanges = command.valueChanges();
+    const QList<PropertyValueContainer> valueChanges = command.valueChanges();
     for (const PropertyValueContainer &container : valueChanges) {
         hasDynamicProperties |= container.isDynamic();
         setInstancePropertyVariant(container);
@@ -636,7 +636,7 @@ void NodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command
 
 void NodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &command)
 {
-    const QVector<PropertyValueContainer> auxiliaryChanges = command.auxiliaryChanges;
+    const QList<PropertyValueContainer> auxiliaryChanges = command.auxiliaryChanges;
     for (const PropertyValueContainer &container : auxiliaryChanges)
         setInstanceAuxiliaryData(container);
 
@@ -646,7 +646,7 @@ void NodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &com
 void NodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &command)
 {
     bool hasDynamicProperties = false;
-    const QVector<PropertyBindingContainer> bindingChanges = command.bindingChanges;
+    const QList<PropertyBindingContainer> bindingChanges = command.bindingChanges;
     for (const PropertyBindingContainer &container : bindingChanges) {
         hasDynamicProperties |= container.isDynamic();
         setInstancePropertyBinding(container);
@@ -688,7 +688,7 @@ QQmlContext *NodeInstanceServer::rootContext() const
     return engine()->rootContext();
 }
 
-const QVector<NodeInstanceServer::InstancePropertyPair> NodeInstanceServer::changedPropertyList() const
+const QList<NodeInstanceServer::InstancePropertyPair> NodeInstanceServer::changedPropertyList() const
 {
     return m_changedPropertyList;
 }
@@ -724,7 +724,7 @@ static bool isTypeAvailable(const MockupTypeContainer &mockupType, QQmlEngine *e
     return !component.isError();
 }
 
-void NodeInstanceServer::setupMockupTypes(const QVector<MockupTypeContainer> &container)
+void NodeInstanceServer::setupMockupTypes(const QList<MockupTypeContainer> &container)
 {
     for (const MockupTypeContainer &mockupType : container) {
         if (!isTypeAvailable(mockupType, engine())) {
@@ -1082,9 +1082,9 @@ NodeInstanceClientInterface *NodeInstanceServer::nodeInstanceClient() const
     return m_nodeInstanceClient;
 }
 
-static QVector<InformationContainer> createInformationVector(const QList<ServerNodeInstance> &instanceList, bool initial)
+static QList<InformationContainer> createInformationVector(const QList<ServerNodeInstance> &instanceList, bool initial)
 {
-    QVector<InformationContainer> informationVector;
+    QList<InformationContainer> informationVector;
 
     for (const ServerNodeInstance &instance : instanceList) {
         if (instance.isValid()) {
@@ -1166,7 +1166,7 @@ static QVector<InformationContainer> createInformationVector(const QList<ServerN
 ChildrenChangedCommand NodeInstanceServer::createChildrenChangedCommand(const ServerNodeInstance &parentInstance,
                                                                         const QList<ServerNodeInstance> &instanceList) const
 {
-    QVector<qint32> instanceVector;
+    QList<qint32> instanceVector;
 
     for (const ServerNodeInstance &instance : instanceList)
         instanceVector.append(instance.instanceId());
@@ -1190,7 +1190,7 @@ static bool supportedVariantType(int type)
 
 ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList<ServerNodeInstance> &instanceList) const
 {
-    QVector<PropertyValueContainer> valueVector;
+    QList<PropertyValueContainer> valueVector;
 
     for (const ServerNodeInstance &instance : instanceList) {
         const QList<PropertyName> propertyNames = instance.propertyNames();
@@ -1208,7 +1208,7 @@ ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList<
 
 ComponentCompletedCommand NodeInstanceServer::createComponentCompletedCommand(const QList<ServerNodeInstance> &instanceList)
 {
-    QVector<qint32> idVector;
+    QList<qint32> idVector;
     for (const ServerNodeInstance &instance : instanceList) {
         if (instance.instanceId() >= 0)
             idVector.append(instance.instanceId());
@@ -1219,7 +1219,7 @@ ComponentCompletedCommand NodeInstanceServer::createComponentCompletedCommand(co
 
 ChangeSelectionCommand NodeInstanceServer::createChangeSelectionCommand(const QList<ServerNodeInstance> &instanceList)
 {
-    QVector<qint32> idVector;
+    QList<qint32> idVector;
     for (const ServerNodeInstance &instance : instanceList) {
         if (instance.instanceId() >= 0)
             idVector.append(instance.instanceId());
@@ -1228,9 +1228,9 @@ ChangeSelectionCommand NodeInstanceServer::createChangeSelectionCommand(const QL
     return ChangeSelectionCommand(idVector);
 }
 
-ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QVector<InstancePropertyPair> &propertyList) const
+ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList<InstancePropertyPair> &propertyList) const
 {
-    QVector<PropertyValueContainer> valueVector;
+    QList<PropertyValueContainer> valueVector;
 
     for (const InstancePropertyPair &property : propertyList) {
         const PropertyName propertyName = property.second;
@@ -1257,9 +1257,9 @@ ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QVecto
 }
 
 ValuesModifiedCommand NodeInstanceServer::createValuesModifiedCommand(
-    const QVector<InstancePropertyValueTriple> &propertyList) const
+    const QList<InstancePropertyValueTriple> &propertyList) const
 {
-    QVector<PropertyValueContainer> valueVector;
+    QList<PropertyValueContainer> valueVector;
 
     for (const InstancePropertyValueTriple &property : propertyList) {
         const PropertyName propertyName = property.propertyName;
@@ -1322,7 +1322,7 @@ PixmapChangedCommand NodeInstanceServer::createPixmapChangedCommand(const QList<
 {
     NANOTRACE_SCOPE("Update", "createPixmapChangedCommand");
 
-    QVector<ImageContainer> imageVector;
+    QList<ImageContainer> imageVector;
 
     for (const ServerNodeInstance &instance : instanceList) {
         if (!instance.isValid())
@@ -1440,13 +1440,13 @@ void NodeInstanceServer::loadDummyDataContext(const QString &directory)
 void NodeInstanceServer::sendDebugOutput(DebugOutputCommand::Type type, const QString &message,
                                          qint32 instanceId)
 {
-    QVector<qint32> ids;
+    QList<qint32> ids;
     ids.append(instanceId);
     sendDebugOutput(type, message, ids);
 }
 
 void NodeInstanceServer::sendDebugOutput(DebugOutputCommand::Type type, const QString &message,
-                                         const QVector<qint32> &instanceIds)
+                                         const QList<qint32> &instanceIds)
 {
     DebugOutputCommand command(message, type, instanceIds);
     nodeInstanceClient()->debugOutput(command);
@@ -1532,7 +1532,7 @@ void NodeInstanceServer::sheduleRootItemRender()
 
     if (result) {
         connect(result.data(), &QQuickItemGrabResult::ready, [this, result, instanceId] {
-            QVector<ImageContainer> imageVector;
+            QList<ImageContainer> imageVector;
             ImageContainer container(instanceId, result->image(), instanceId);
             imageVector.append(container);
             nodeInstanceClient()->pixmapChanged(PixmapChangedCommand(imageVector));
@@ -1618,7 +1618,7 @@ void NodeInstanceServer::addAnimation(QQuickAbstractAnimation *animation)
     }
 }
 
-QVector<QQuickAbstractAnimation *> NodeInstanceServer::animations() const
+QList<QQuickAbstractAnimation *> NodeInstanceServer::animations() const
 {
     return m_animations;
 }

src/tools/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h

@@ -5,7 +5,6 @@
 
 #include <QDebug>
 #include <QUrl>
-#include <QVector>
 #include <QSet>
 #include <QStringList>
 #include <QPointer>
@@ -153,7 +152,7 @@ public:
     ServerNodeInstance instanceForObject(QObject *object) const;
     bool hasInstanceForObject(QObject *object) const;
 
-    const QVector<ServerNodeInstance> &nodeInstances() const { return m_idInstances; }
+    const QList<ServerNodeInstance> &nodeInstances() const { return m_idInstances; }
 
     virtual QQmlEngine *engine() const = 0;
     QQmlContext *context() const;
@@ -190,7 +189,7 @@ public:
     virtual void setRootItem(QQuickItem *item) = 0;
 
     void sendDebugOutput(DebugOutputCommand::Type type, const QString &message, qint32 instanceId = 0);
-    void sendDebugOutput(DebugOutputCommand::Type type, const QString &message, const QVector<qint32> &instanceIds);
+    void sendDebugOutput(DebugOutputCommand::Type type, const QString &message, const QList<qint32> &instanceIds);
 
     void removeInstanceRelationsipForDeletedObject(QObject *object, qint32 instanceId);
 
@@ -213,7 +212,7 @@ public:
     virtual bool isInformationServer() const;
     virtual bool isPreviewServer() const;
     void addAnimation(QQuickAbstractAnimation *animation);
-    QVector<QQuickAbstractAnimation *> animations() const;
+    QList<QQuickAbstractAnimation *> animations() const;
     QVariant animationDefaultValue(int index) const;
 
 public slots:
@@ -222,8 +221,8 @@ public slots:
     void emitParentChanged(QObject *child);
 
 protected:
-    virtual QList<ServerNodeInstance> createInstances(const QVector<InstanceContainer> &container);
-    void reparentInstances(const QVector<ReparentContainer> &containerVector);
+    virtual QList<ServerNodeInstance> createInstances(const QList<InstanceContainer> &container);
+    void reparentInstances(const QList<ReparentContainer> &containerVector);
 
     Internal::ChildrenChangeEventFilter *childrenChangeEventFilter();
     void resetInstanceProperty(const PropertyAbstractContainer &propertyContainer);
@@ -240,8 +239,8 @@ protected:
     void timerEvent(QTimerEvent *) override;
 
     ValuesChangedCommand createValuesChangedCommand(const QList<ServerNodeInstance> &instanceList) const;
-    ValuesChangedCommand createValuesChangedCommand(const QVector<InstancePropertyPair> &propertyList) const;
-    ValuesModifiedCommand createValuesModifiedCommand(const QVector<InstancePropertyValueTriple> &propertyList) const;
+    ValuesChangedCommand createValuesChangedCommand(const QList<InstancePropertyPair> &propertyList) const;
+    ValuesModifiedCommand createValuesModifiedCommand(const QList<InstancePropertyValueTriple> &propertyList) const;
     PixmapChangedCommand createPixmapChangedCommand(const QList<ServerNodeInstance> &instanceList) const;
     InformationChangedCommand createAllInformationChangedCommand(const QList<ServerNodeInstance> &instanceList, bool initial = false) const;
     ChildrenChangedCommand createChildrenChangedCommand(const ServerNodeInstance &parentInstance, const QList<ServerNodeInstance> &instanceList) const;
@@ -276,16 +275,16 @@ protected:
     QQmlContext *rootContext() const;
 
 
-    const QVector<InstancePropertyPair> changedPropertyList() const;
+    const QList<InstancePropertyPair> changedPropertyList() const;
     void clearChangedPropertyList();
 
     virtual void refreshBindings() = 0;
 
     void setupDummysForContext(QQmlContext *context);
 
-    void setupMockupTypes(const QVector<MockupTypeContainer> &container);
+    void setupMockupTypes(const QList<MockupTypeContainer> &container);
     void setupFileUrl(const QUrl &fileUrl);
-    void setupImports(const QVector<AddImportContainer> &container);
+    void setupImports(const QList<AddImportContainer> &container);
     void setupDummyData(const QUrl &fileUrl);
     void setupDefaultDummyData();
     QList<ServerNodeInstance> setupInstances(const CreateSceneCommand &command);
@@ -301,7 +300,7 @@ private:
     void setupOnlyWorkingImports(const QStringList &workingImportStatementList);
     ServerNodeInstance m_rootNodeInstance;
     ServerNodeInstance m_activeStateInstance;
-    QVector<ServerNodeInstance> m_idInstances;
+    QList<ServerNodeInstance> m_idInstances;
     QHash<QObject*, ServerNodeInstance> m_objectInstanceHash;
     QMultiHash<QString, ObjectPropertyPair> m_fileSystemWatcherHash;
     QList<QPair<QString, QPointer<QObject> > > m_dummyObjectList;
@@ -314,7 +313,7 @@ private:
     int m_renderTimerInterval = 16;
     TimerMode m_timerMode = TimerMode::NormalTimer;
     int m_timerModeInterval = 200;
-    QVector<InstancePropertyPair> m_changedPropertyList;
+    QList<InstancePropertyPair> m_changedPropertyList;
     QByteArray m_importCode;
     QPointer<QObject> m_dummyContextObject;
     QPointer<QQmlComponent> m_importComponent;
@@ -322,8 +321,8 @@ private:
     std::unique_ptr<MultiLanguage::Link> multilanguageLink;
     int m_needsExtraRenderCount = 0;
     int m_extraRenderCurrentPass = 0;
-    QVector<QQuickAbstractAnimation *> m_animations;
-    QVector<QVariant> m_defaultValues;
+    QList<QQuickAbstractAnimation *> m_animations;
+    QList<QVariant> m_defaultValues;
 };
 
 }

src/tools/qmlpuppet/qmlpuppet/instances/qt5capturepreviewnodeinstanceserver.cpp

@@ -29,7 +29,7 @@ QImage renderPreviewImage(ServerNodeInstance rootNodeInstance)
 }
 
 CapturedDataCommand::StateData collectStateData(ServerNodeInstance rootNodeInstance,
-                                                const QVector<ServerNodeInstance> &nodeInstances,
+                                                const QList<ServerNodeInstance> &nodeInstances,
                                                 qint32 stateInstanceId)
 {
     CapturedDataCommand::StateData stateData;
@@ -74,7 +74,7 @@ void Qt5CapturePreviewNodeInstanceServer::collectItemChangesAndSendChangeCommand
 
         QQuickDesignerSupport::polishItems(quickWindow());
 
-        QVector<CapturedDataCommand::StateData> stateDatas;
+        QList<CapturedDataCommand::StateData> stateDatas;
         stateDatas.push_back(collectStateData(rootNodeInstance(), nodeInstances(), 0));
 
         for (ServerNodeInstance stateInstance : rootNodeInstance().stateInstances()) {

src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.cpp

@@ -327,7 +327,7 @@ void Qt5InformationNodeInstanceServer::updateActiveScenePreferredCamera()
 }
 
 void Qt5InformationNodeInstanceServer::updateMaterialPreviewData(
-    const QVector<PropertyValueContainer> &valueChanges)
+    const QList<PropertyValueContainer> &valueChanges)
 {
     for (const auto &container : valueChanges) {
         if (container.instanceId() == 0) {
@@ -342,7 +342,7 @@ void Qt5InformationNodeInstanceServer::updateMaterialPreviewData(
 }
 
 void Qt5InformationNodeInstanceServer::updateRotationBlocks(
-    [[maybe_unused]] const QVector<PropertyValueContainer> &valueChanges)
+    [[maybe_unused]] const QList<PropertyValueContainer> &valueChanges)
 {
 #ifdef QUICK3D_MODULE
     auto helper = qobject_cast<QmlDesigner::Internal::GeneralHelper *>(m_3dHelper);
@@ -372,7 +372,7 @@ void Qt5InformationNodeInstanceServer::updateRotationBlocks(
 }
 
 void Qt5InformationNodeInstanceServer::updateSnapAndCameraSettings(
-    [[maybe_unused]] const QVector<PropertyValueContainer> &valueChanges)
+    [[maybe_unused]] const QList<PropertyValueContainer> &valueChanges)
 {
 #ifdef QUICK3D_MODULE
     auto helper = qobject_cast<QmlDesigner::Internal::GeneralHelper *>(m_3dHelper);
@@ -411,7 +411,7 @@ void Qt5InformationNodeInstanceServer::updateSnapAndCameraSettings(
 }
 
 void Qt5InformationNodeInstanceServer::updateColorSettings(
-    [[maybe_unused]] const QVector<PropertyValueContainer> &valueChanges)
+    [[maybe_unused]] const QList<PropertyValueContainer> &valueChanges)
 {
 #ifdef QUICK3D_MODULE
     if (m_editView3DData.rootItem) {
@@ -430,7 +430,7 @@ void Qt5InformationNodeInstanceServer::updateColorSettings(
 }
 
 void Qt5InformationNodeInstanceServer::removeRotationBlocks(
-    [[maybe_unused]] const QVector<qint32> &instanceIds)
+    [[maybe_unused]] const QList<qint32> &instanceIds)
 {
 #ifdef QUICK3D_MODULE
     auto helper = qobject_cast<QmlDesigner::Internal::GeneralHelper *>(m_3dHelper);
@@ -642,7 +642,7 @@ void Qt5InformationNodeInstanceServer::handleParticleSystemSelected(QQuick3DPart
                    || ServerNodeInstance::isSubclassOf(o, "QQuickSequentialAnimation");
         };
 
-        const QVector<QQuickAbstractAnimation *> anims = animations();
+        const QList<QQuickAbstractAnimation *> anims = animations();
         QSet<QQuickAbstractAnimation *> containers;
         for (auto a : anims) {
             // Stop all animations by default. We only want to run animations related to currently
@@ -802,13 +802,13 @@ void Qt5InformationNodeInstanceServer::handleSelectionChanged(const QVariant &ob
     m_selectionChangeTimer.start(500);
 }
 
-QVector<Qt5InformationNodeInstanceServer::InstancePropertyValueTriple>
+QList<Qt5InformationNodeInstanceServer::InstancePropertyValueTriple>
 Qt5InformationNodeInstanceServer::propertyToPropertyValueTriples(
     const ServerNodeInstance &instance,
     const PropertyName &propertyName,
     const QVariant &variant)
 {
-    QVector<InstancePropertyValueTriple> result;
+    QList<InstancePropertyValueTriple> result;
     InstancePropertyValueTriple propTriple;
 
     if (variant.typeId() == QMetaType::QVector3D) {
@@ -854,7 +854,7 @@ void Qt5InformationNodeInstanceServer::modifyVariantValue(const QObjectList &obj
     }
 
     if (!objects.isEmpty()) {
-        QVector<PropertyValueContainer> valueVector;
+        QList<PropertyValueContainer> valueVector;
         for (const auto listObj : objects) {
             ServerNodeInstance instance = instanceForObject(listObj);
             if (instance.isValid()) {
@@ -865,7 +865,7 @@ void Qt5InformationNodeInstanceServer::modifyVariantValue(const QObjectList &obj
                     instance.setModifiedFlag(false);
                 for (const auto &propNamePair : propNamePairs) {
                     // We do have to split vector3d props into foobar.x, foobar.y, foobar.z
-                    const QVector<InstancePropertyValueTriple> triple
+                    const QList<InstancePropertyValueTriple> triple
                             = propertyToPropertyValueTriples(instance, propNamePair.targetPropName,
                                                              listObj->property(propNamePair.origPropName));
                     for (const auto &property : triple) {
@@ -1631,13 +1631,13 @@ void Qt5InformationNodeInstanceServer::selectInstances(const QList<ServerNodeIns
  * For performance reasons (and the undo stack) properties should always be modifed in 'bulks'.
  */
 void Qt5InformationNodeInstanceServer::modifyProperties(
-    const QVector<NodeInstanceServer::InstancePropertyValueTriple> &properties)
+    const QList<NodeInstanceServer::InstancePropertyValueTriple> &properties)
 {
     nodeInstanceClient()->valuesModified(createValuesModifiedCommand(properties));
 }
 
 QList<ServerNodeInstance> Qt5InformationNodeInstanceServer::createInstances(
-        const QVector<InstanceContainer> &container)
+        const QList<InstanceContainer> &container)
 {
     const auto createdInstances = NodeInstanceServer::createInstances(container);
 
@@ -2054,7 +2054,7 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
         QQuickDesignerSupport::polishItems(quickWindow());
 
         QSet<ServerNodeInstance> informationChangedInstanceSet;
-        QVector<InstancePropertyPair> propertyChangedList;
+        QList<InstancePropertyPair> propertyChangedList;
 
         if (quickWindow()) {
             for (QQuickItem *item : allItems()) {
@@ -2221,7 +2221,7 @@ void Qt5InformationNodeInstanceServer::completeComponent(const CompleteComponent
     Qt5NodeInstanceServer::completeComponent(command);
 
     QList<ServerNodeInstance> instanceList;
-    const QVector<qint32> instances = command.instances();
+    const QList<qint32> instances = command.instances();
     for (qint32 instanceId : instances) {
         if (hasInstanceForId(instanceId)) {
             ServerNodeInstance instance = instanceForId(instanceId);
@@ -2258,7 +2258,7 @@ void Qt5InformationNodeInstanceServer::changeSelection(const ChangeSelectionComm
     }
 
     // Find a scene root of the selection to update active scene shown
-    const QVector<qint32> instanceIds = command.instanceIds();
+    const QList<qint32> instanceIds = command.instanceIds();
     QVariantList selectedObjs;
     QObject *firstSceneRoot = nullptr;
     ServerNodeInstance firstInstance;
@@ -2473,7 +2473,7 @@ bool Qt5InformationNodeInstanceServer::isSceneEnvironmentBgProperty(const Proper
 void Qt5InformationNodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command)
 {
     bool hasDynamicProperties = false;
-    const QVector<PropertyValueContainer> values = command.valueChanges();
+    const QList<PropertyValueContainer> values = command.valueChanges();
     QSet<qint32> sceneEnvs;
     for (const PropertyValueContainer &container : values) {
         if (!container.isReflected()) {
@@ -2757,7 +2757,7 @@ void Qt5InformationNodeInstanceServer::changeState(const ChangeStateCommand &com
 
 void Qt5InformationNodeInstanceServer::removeProperties(const RemovePropertiesCommand &command)
 {
-    const QVector<PropertyAbstractContainer> props = command.properties();
+    const QList<PropertyAbstractContainer> props = command.properties();
     QSet<qint32> sceneEnvs;
 
     for (const PropertyAbstractContainer &container : props) {

src/tools/qmlpuppet/qmlpuppet/instances/qt5informationnodeinstanceserver.h

@@ -80,8 +80,8 @@ protected:
     bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const;
     bool isDirtyRecursiveForParentInstances(QQuickItem *item) const;
     void selectInstances(const QList<ServerNodeInstance> &instanceList);
-    void modifyProperties(const QVector<InstancePropertyValueTriple> &properties);
-    QList<ServerNodeInstance> createInstances(const QVector<InstanceContainer> &container) override;
+    void modifyProperties(const QList<InstancePropertyValueTriple> &properties);
+    QList<ServerNodeInstance> createInstances(const QList<InstanceContainer> &container) override;
     void initializeAuxiliaryViews() override;
 
 private:
@@ -98,7 +98,7 @@ private:
     QObject *findView3DForSceneRoot(QObject *sceneRoot) const;
     QObject *find3DSceneRoot(const ServerNodeInstance &instance) const;
     QObject *find3DSceneRoot(QObject *obj) const;
-    QVector<InstancePropertyValueTriple> propertyToPropertyValueTriples(
+    QList<InstancePropertyValueTriple> propertyToPropertyValueTriples(
             const ServerNodeInstance &instance,
             const PropertyName &propertyName,
             const QVariant &variant);
@@ -122,11 +122,11 @@ private:
     void handleInputEvents();
     void resolveImportSupport();
     void updateActiveScenePreferredCamera();
-    void updateMaterialPreviewData(const QVector<PropertyValueContainer> &valueChanges);
-    void updateRotationBlocks(const QVector<PropertyValueContainer> &valueChanges);
-    void updateSnapAndCameraSettings(const QVector<PropertyValueContainer> &valueChanges);
-    void updateColorSettings(const QVector<PropertyValueContainer> &valueChanges);
-    void removeRotationBlocks(const QVector<qint32> &instanceIds);
+    void updateMaterialPreviewData(const QList<PropertyValueContainer> &valueChanges);
+    void updateRotationBlocks(const QList<PropertyValueContainer> &valueChanges);
+    void updateSnapAndCameraSettings(const QList<PropertyValueContainer> &valueChanges);
+    void updateColorSettings(const QList<PropertyValueContainer> &valueChanges);
+    void removeRotationBlocks(const QList<qint32> &instanceIds);
     void getNodeAtPos(const QPointF &pos);
     void getNodeAtMainScenePos(const QPointF &pos, qint32 viewId);
 

src/tools/qmlpuppet/qmlpuppet/instances/qt5previewnodeinstanceserver.cpp

@@ -52,7 +52,7 @@ void Qt5PreviewNodeInstanceServer::collectItemChangesAndSendChangeCommands()
 
         QQuickDesignerSupport::polishItems(quickWindow());
 
-        QVector<ImageContainer> imageContainerVector;
+        QList<ImageContainer> imageContainerVector;
 
         // Base state needs to be rendered twice to properly render shared resources,
         // if there is more than one View3D and at least one of them is dirty.

src/tools/qmlpuppet/qmlpuppet/instances/qt5rendernodeinstanceserver.cpp

@@ -207,7 +207,7 @@ void Qt5RenderNodeInstanceServer::completeComponent(const CompleteComponentComma
 {
     Qt5NodeInstanceServer::completeComponent(command);
 
-    const QVector<qint32> ids = command.instances();
+    const QList<qint32> ids = command.instances();
     for (qint32 instanceId : ids) {
         if (hasInstanceForId(instanceId)) {
             ServerNodeInstance instance = instanceForId(instanceId);
@@ -227,7 +227,7 @@ void Qt5RenderNodeInstanceServer::changePropertyValues(const ChangeValuesCommand
 {
     Qt5NodeInstanceServer::changePropertyValues(command);
 
-    const QVector<PropertyValueContainer> values = command.valueChanges();
+    const QList<PropertyValueContainer> values = command.valueChanges();
     for (const PropertyValueContainer &container : values) {
         // In case an effect item visibility changed to false, make sure all children are rendered
         // again as they might not have valid pixmaps yet
@@ -255,7 +255,7 @@ void Qt5RenderNodeInstanceServer::changePropertyBindings(const ChangeBindingsCom
 {
     Qt5NodeInstanceServer::changePropertyBindings(command);
 
-    const QVector<PropertyBindingContainer> changes = command.bindingChanges;
+    const QList<PropertyBindingContainer> changes = command.bindingChanges;
     for (const PropertyBindingContainer &container : changes) {
         if (container.isDynamic() && hasInstanceForId(container.instanceId())) {
             // Changes to dynamic properties are not always noticed by normal signal spy mechanism
@@ -269,7 +269,7 @@ void Qt5RenderNodeInstanceServer::reparentInstances(const ReparentInstancesComma
 {
     ServerNodeInstance effectNode;
     ServerNodeInstance oldParent;
-    const QVector<ReparentContainer> containers = command.reparentInstances();
+    const QList<ReparentContainer> containers = command.reparentInstances();
     for (const ReparentContainer &container : containers) {
         if (hasInstanceForId(container.instanceId())) {
             ServerNodeInstance instance = instanceForId(container.instanceId());
@@ -304,7 +304,7 @@ void Qt5RenderNodeInstanceServer::reparentInstances(const ReparentInstancesComma
 void Qt5RenderNodeInstanceServer::removeInstances(const RemoveInstancesCommand &command)
 {
     ServerNodeInstance oldParent;
-    const QVector<qint32> ids = command.instanceIds();
+    const QList<qint32> ids = command.instanceIds();
     for (qint32 id : ids) {
         if (hasInstanceForId(id)) {
             ServerNodeInstance instance = instanceForId(id);

src/tools/qmlpuppet/qmlpuppet/instances/qt5testnodeinstanceserver.cpp

@@ -238,7 +238,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm
     QQuickDesignerSupport::polishItems(quickWindow());
 
     QSet<ServerNodeInstance> informationChangedInstanceSet;
-    QVector<InstancePropertyPair> propertyChangedList;
+    QList<InstancePropertyPair> propertyChangedList;
     QSet<ServerNodeInstance> parentChangedSet;
 
     if (quickWindow()) {