Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: Ibaf2524e49e75ec660889261347eddbae9ccdbc6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

25 files changed, 195 insertions, 196 deletions

diff --git a/examples/scxml/sudoku/doc/src/sudoku.qdoc b/examples/scxml/sudoku/doc/src/sudoku.qdoc
index c3d8971..c9a27e3 100644
--- a/examples/scxml/sudoku/doc/src/sudoku.qdoc
+++ b/examples/scxml/sudoku/doc/src/sudoku.qdoc
@@ -106,10 +106,10 @@
             remains unchanged.
     \row
         \li \c undoStack
-        \li Holds the history of players' moves. It is a vector of
+        \li Holds the history of players' moves. It is a list of
             the cells' coordinates that were touched last. Each
             new modification during a game adds a pair of
-            x and y coordinates to that vector.
+            x and y coordinates to that list.
     \endtable
 
     The variables above are shared with the script helper functions
@@ -257,12 +257,12 @@
     grid is properly solved. Since we need to check
     each row, each column, and each 3x3 square, we define
     the \c isOK() helper function. This function takes
-    the vector of numbers and returns \c true if the passed vector
+    the list of numbers and returns \c true if the passed list
     contains unique numbers and no number equals zero, meaning
     there is no empty cell. The main loop of the \c isSolved() is invoked
-    nine times. In every iteration, we construct three vectors of numbers
+    nine times. In every iteration, we construct three lists of numbers
     representing a row, a column, and a square of the grid and call \c isOK()
-    for them. When all 27 vectors are OK, the grid is solved properly
+    for them. When all 27 lists are OK, the grid is solved properly
     and we return \c true.
 
     Coming back to our SCXML file, in case \c isSolved()
diff --git a/examples/scxml/sudoku/mainwindow.cpp b/examples/scxml/sudoku/mainwindow.cpp
index 8b521ae..21f4335 100644
--- a/examples/scxml/sudoku/mainwindow.cpp
+++ b/examples/scxml/sudoku/mainwindow.cpp
@@ -106,8 +106,8 @@ MainWindow::MainWindow(QScxmlStateMachine *machine, QWidget *parent) :
     QWidget(parent),
     m_machine(machine)
 {
-    const QVector<QToolButton *> initVector(Size, nullptr);
-    m_buttons = QVector<QVector<QToolButton *> >(Size, initVector);
+    const QList<QToolButton *> initVector(Size, nullptr);
+    m_buttons = QList<QList<QToolButton *>>(Size, initVector);
 
     QGridLayout *layout = new QGridLayout(this);
 
diff --git a/examples/scxml/sudoku/mainwindow.h b/examples/scxml/sudoku/mainwindow.h
index b37279e..96fec27 100644
--- a/examples/scxml/sudoku/mainwindow.h
+++ b/examples/scxml/sudoku/mainwindow.h
@@ -71,7 +71,7 @@ public:
 
 private:
     QScxmlStateMachine *m_machine;
-    QVector<QVector<QToolButton *> > m_buttons;
+    QList<QList<QToolButton *>> m_buttons;
     QToolButton *m_startButton;
     QToolButton *m_undoButton;
     QLabel *m_label;
diff --git a/src/imports/scxmlstatemachine/invokedservices.cpp b/src/imports/scxmlstatemachine/invokedservices.cpp
index 8c14922..53cac0e 100644
--- a/src/imports/scxmlstatemachine/invokedservices.cpp
+++ b/src/imports/scxmlstatemachine/invokedservices.cpp
@@ -71,7 +71,7 @@ QVariantMap QScxmlInvokedServices::children()
 {
     QVariantMap ret;
     if (m_stateMachine) {
-        const QVector<QScxmlInvokableService *> children = m_stateMachine->invokedServices();
+        const QList<QScxmlInvokableService *> children = m_stateMachine->invokedServices();
         for (QScxmlInvokableService *service : children)
             ret.insert(service->name(), QVariant::fromValue(service));
     }
diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp
index 76c70d8..c19b9cf 100644
--- a/src/scxml/qscxmlcompiler.cpp
+++ b/src/scxml/qscxmlcompiler.cpp
@@ -43,7 +43,7 @@
 #include <qxmlstream.h>
 #include <qloggingcategory.h>
 #include <qfile.h>
-#include <qvector.h>
+#include <qlist.h>
 #include <qstring.h>
 
 #ifndef BUILD_QSCXMLC
@@ -117,7 +117,7 @@ private:
                 scxml->initialTransition = createInitialTransition({firstChild});
             }
         } else {
-            QVector<DocumentModel::AbstractState *> initialStates;
+            QList<DocumentModel::AbstractState *> initialStates;
             for (const QString &initial : qAsConst(scxml->initial)) {
                 if (DocumentModel::AbstractState *s = m_stateById.value(initial))
                     initialStates.append(s);
@@ -155,7 +155,7 @@ private:
                 }
             } else {
                 Q_ASSERT(state->type == DocumentModel::State::Normal);
-                QVector<DocumentModel::AbstractState *> initialStates;
+                QList<DocumentModel::AbstractState *> initialStates;
                 for (const QString &initialState : qAsConst(state->initial)) {
                     if (DocumentModel::AbstractState *s = m_stateById.value(initialState)) {
                         initialStates.append(s);
@@ -387,7 +387,7 @@ private:
         return true;
     }
 
-    static const QVector<DocumentModel::StateOrTransition *> &allChildrenOfContainer(
+    static const QList<DocumentModel::StateOrTransition *> &allChildrenOfContainer(
             DocumentModel::StateContainer *container)
     {
         if (auto state = container->asState())
@@ -402,7 +402,7 @@ private:
     {
         const auto &allChildren = allChildrenOfContainer(container);
 
-        QVector<DocumentModel::AbstractState *> childStates;
+        QList<DocumentModel::AbstractState *> childStates;
         for (DocumentModel::StateOrTransition *child : qAsConst(allChildren)) {
             if (DocumentModel::State *s = child->asState())
                 return s;
@@ -412,12 +412,12 @@ private:
         return nullptr;
     }
 
-    static QVector<DocumentModel::AbstractState *> allAbstractStates(
+    static QList<DocumentModel::AbstractState *> allAbstractStates(
             DocumentModel::StateContainer *container)
     {
         const auto &allChildren = allChildrenOfContainer(container);
 
-        QVector<DocumentModel::AbstractState *> childStates;
+        QList<DocumentModel::AbstractState *> childStates;
         for (DocumentModel::StateOrTransition *child : qAsConst(allChildren)) {
             if (DocumentModel::State *s = child->asState())
                 childStates.append(s);
@@ -428,7 +428,7 @@ private:
     }
 
     DocumentModel::Transition *createInitialTransition(
-            const QVector<DocumentModel::AbstractState *> &states)
+            const QList<DocumentModel::AbstractState *> &states)
     {
         auto *newTransition = m_doc->newTransition(nullptr, DocumentModel::XmlLocation(-1, -1));
         newTransition->type = DocumentModel::Transition::Synthetic;
@@ -460,7 +460,7 @@ private:
     DocumentModel::ScxmlDocument *m_doc;
     bool m_hasErrors;
     QHash<QString, DocumentModel::AbstractState *> m_stateById;
-    QVector<DocumentModel::Node *> m_parentNodes;
+    QList<DocumentModel::Node *> m_parentNodes;
 };
 
 #ifndef BUILD_QSCXMLC
@@ -469,8 +469,8 @@ class InvokeDynamicScxmlFactory: public QScxmlInvokableServiceFactory
     Q_OBJECT
 public:
     InvokeDynamicScxmlFactory(const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-                              const QVector<QScxmlExecutableContent::StringId> &namelist,
-                              const QVector<QScxmlExecutableContent::ParameterInfo> &params)
+                              const QList<QScxmlExecutableContent::StringId> &namelist,
+                              const QList<QScxmlExecutableContent::ParameterInfo> &params)
         : QScxmlInvokableServiceFactory(invokeInfo, namelist, params)
     {}
 
@@ -602,8 +602,8 @@ public:
         DataModelInfo dm;
         auto factoryIdCreator = [stateMachine](
                 const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-                const QVector<QScxmlExecutableContent::StringId> &namelist,
-                const QVector<QScxmlExecutableContent::ParameterInfo> &params,
+                const QList<QScxmlExecutableContent::StringId> &namelist,
+                const QList<QScxmlExecutableContent::ParameterInfo> &params,
                 const QSharedPointer<DocumentModel::ScxmlDocument> &content) -> int {
             auto factory = new InvokeDynamicScxmlFactory(invokeInfo, namelist, params);
             factory->setContent(content);
@@ -629,7 +629,7 @@ private:
     }
 
 private:
-    QVector<QScxmlInvokableServiceFactory *> m_allFactoriesById;
+    QList<QScxmlInvokableServiceFactory *> m_allFactoriesById;
     int m_propertyCount;
 };
 
@@ -864,7 +864,7 @@ void QScxmlCompilerPrivate::instantiateDataModel(QScxmlStateMachine *stateMachin
 /*!
  * Returns the list of parse errors.
  */
-QVector<QScxmlError> QScxmlCompiler::errors() const
+QList<QScxmlError> QScxmlCompiler::errors() const
 {
     return d->errors();
 }
@@ -2327,7 +2327,7 @@ QByteArray QScxmlCompilerPrivate::load(const QString &name, bool *ok)
     return result;
 }
 
-QVector<QScxmlError> QScxmlCompilerPrivate::errors() const
+QList<QScxmlError> QScxmlCompilerPrivate::errors() const
 {
     return m_errors;
 }
diff --git a/src/scxml/qscxmlcompiler.h b/src/scxml/qscxmlcompiler.h
index 411dfde..05d01b5 100644
--- a/src/scxml/qscxmlcompiler.h
+++ b/src/scxml/qscxmlcompiler.h
@@ -72,7 +72,7 @@ public:
     void setLoader(Loader *newLoader);
 
     QScxmlStateMachine *compile();
-    QVector<QScxmlError> errors() const;
+    QList<QScxmlError> errors() const;
 
 private:
     friend class QScxmlCompilerPrivate;
diff --git a/src/scxml/qscxmlcompiler_p.h b/src/scxml/qscxmlcompiler_p.h
index 4b270f8..26f8061 100644
--- a/src/scxml/qscxmlcompiler_p.h
+++ b/src/scxml/qscxmlcompiler_p.h
@@ -129,7 +129,7 @@ struct DoneData: public Node
 {
     QString contents;
     QString expr;
-    QVector<Param *> params;
+    QList<Param *> params;
 
     DoneData(const XmlLocation &xmlLocation): Node(xmlLocation) {}
     void accept(NodeVisitor *visitor) override;
@@ -141,8 +141,8 @@ struct Instruction: public Node
     virtual ~Instruction() {}
 };
 
-typedef QVector<Instruction *> InstructionSequence;
-typedef QVector<InstructionSequence *> InstructionSequences;
+typedef QList<Instruction *> InstructionSequence;
+typedef QList<InstructionSequence *> InstructionSequences;
 
 struct Send: public Instruction
 {
@@ -157,7 +157,7 @@ struct Send: public Instruction
     QString delay;
     QString delayexpr;
     QStringList namelist;
-    QVector<Param *> params;
+    QList<Param *> params;
     QString content;
     QString contentexpr;
 
@@ -177,7 +177,7 @@ struct Invoke: public Instruction
     QString idLocation;
     QStringList namelist;
     bool autoforward;
-    QVector<Param *> params;
+    QList<Param *> params;
     InstructionSequence finalize;
 
     QSharedPointer<ScxmlDocument> content;
@@ -285,12 +285,12 @@ struct State: public AbstractState, public StateOrTransition
     enum Type { Normal, Parallel, Final };
 
     QStringList initial;
-    QVector<DataElement *> dataElements;
-    QVector<StateOrTransition *> children;
+    QList<DataElement *> dataElements;
+    QList<StateOrTransition *> children;
     InstructionSequences onEntry;
     InstructionSequences onExit;
     DoneData *doneData;
-    QVector<Invoke *> invokes;
+    QList<Invoke *> invokes;
     Type type;
 
     Transition *initialTransition; // when not set, it is filled during verification
@@ -322,7 +322,7 @@ struct Transition: public StateOrTransition
     InstructionSequence instructionsOnTransition;
     Type type;
 
-    QVector<AbstractState *> targetStates; // when not set, it is filled during verification
+    QList<AbstractState *> targetStates; // when not set, it is filled during verification
 
     Transition(const XmlLocation &xmlLocation)
         : StateOrTransition(xmlLocation)
@@ -338,7 +338,7 @@ struct HistoryState: public AbstractState, public StateOrTransition
 {
     enum Type { Deep, Shallow };
     Type type;
-    QVector<StateOrTransition *> children;
+    QList<StateOrTransition *> children;
 
     HistoryState(const XmlLocation &xmlLocation)
         : StateOrTransition(xmlLocation)
@@ -376,8 +376,8 @@ struct Scxml: public StateContainer, public Node
     QString cppDataModelClassName;
     QString cppDataModelHeaderName;
     BindingMethod binding;
-    QVector<StateOrTransition *> children;
-    QVector<DataElement *> dataElements;
+    QList<StateOrTransition *> children;
+    QList<DataElement *> dataElements;
     QScopedPointer<Script> script;
     InstructionSequence initialSetup;
 
@@ -405,11 +405,11 @@ struct ScxmlDocument
 {
     const QString fileName;
     Scxml *root;
-    QVector<AbstractState *> allStates;
-    QVector<Transition *> allTransitions;
-    QVector<Node *> allNodes;
-    QVector<InstructionSequence *> allSequences;
-    QVector<ScxmlDocument *> allSubDocuments; // weak pointers
+    QList<AbstractState *> allStates;
+    QList<Transition *> allTransitions;
+    QList<Node *> allNodes;
+    QList<InstructionSequence *> allSequences;
+    QList<ScxmlDocument *> allSubDocuments; // weak pointers
     bool isVerified;
 
     ScxmlDocument(const QString &fileName)
@@ -514,7 +514,7 @@ public:
         }
     }
 
-    void visit(const QVector<DataElement *> &dataElements)
+    void visit(const QList<DataElement *> &dataElements)
     {
         for (DataElement *dataElement : dataElements) {
             Q_ASSERT(dataElement);
@@ -522,7 +522,7 @@ public:
         }
     }
 
-    void visit(const QVector<StateOrTransition *> &children)
+    void visit(const QList<StateOrTransition *> &children)
     {
         for (StateOrTransition *child : children) {
             Q_ASSERT(child);
@@ -538,7 +538,7 @@ public:
         }
     }
 
-    void visit(const QVector<Param *> &params)
+    void visit(const QList<Param *> &params)
     {
         for (Param *param : params) {
             Q_ASSERT(param);
@@ -574,7 +574,7 @@ public:
                          const QString &fileName);
     QByteArray load(const QString &name, bool *ok);
 
-    QVector<QScxmlError> errors() const;
+    QList<QScxmlError> errors() const;
 
     void addError(const QString &msg);
     void addError(const DocumentModel::XmlLocation &location, const QString &msg);
@@ -725,8 +725,8 @@ private:
     QScxmlCompiler::Loader *m_loader;
 
     QXmlStreamReader *m_reader;
-    QVector<ParserState> m_stack;
-    QVector<QScxmlError> m_errors;
+    QList<ParserState> m_stack;
+    QList<QScxmlError> m_errors;
 };
 
 QT_END_NAMESPACE
diff --git a/src/scxml/qscxmldatamodel.h b/src/scxml/qscxmldatamodel.h
index 570358f..49e24c3 100644
--- a/src/scxml/qscxmldatamodel.h
+++ b/src/scxml/qscxmldatamodel.h
@@ -43,7 +43,6 @@
 #include <QtScxml/qscxmlexecutablecontent.h>
 
 #include <QtCore/qvariant.h>
-#include <QtCore/qvector.h>
 
 Q_MOC_INCLUDE(qscxmlstatemachine.h)
 
diff --git a/src/scxml/qscxmlinvokableservice.cpp b/src/scxml/qscxmlinvokableservice.cpp
index 912be00..f3a929c 100644
--- a/src/scxml/qscxmlinvokableservice.cpp
+++ b/src/scxml/qscxmlinvokableservice.cpp
@@ -158,8 +158,8 @@ QScxmlInvokableServicePrivate::QScxmlInvokableServicePrivate(QScxmlStateMachine
 
 QScxmlInvokableServiceFactoryPrivate::QScxmlInvokableServiceFactoryPrivate(
         const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-        const QVector<QScxmlExecutableContent::StringId> &namelist,
-        const QVector<QScxmlExecutableContent::ParameterInfo> &parameters)
+        const QList<QScxmlExecutableContent::StringId> &namelist,
+        const QList<QScxmlExecutableContent::ParameterInfo> &parameters)
     : invokeInfo(invokeInfo)
     , names(namelist)
     , parameters(parameters)
@@ -168,8 +168,8 @@ QScxmlInvokableServiceFactoryPrivate::QScxmlInvokableServiceFactoryPrivate(
 QScxmlStaticScxmlServiceFactoryPrivate::QScxmlStaticScxmlServiceFactoryPrivate(
         const QMetaObject *metaObject,
         const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-        const QVector<QScxmlExecutableContent::StringId> &names,
-        const QVector<QScxmlExecutableContent::ParameterInfo> &parameters)
+        const QList<QScxmlExecutableContent::StringId> &names,
+        const QList<QScxmlExecutableContent::ParameterInfo> &parameters)
     : QScxmlInvokableServiceFactoryPrivate(invokeInfo, names, parameters), metaObject(metaObject)
 {
 }
@@ -188,8 +188,8 @@ QScxmlStateMachine *QScxmlInvokableService::parentStateMachine() const
 
 QScxmlInvokableServiceFactory::QScxmlInvokableServiceFactory(
         const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-        const QVector<QScxmlExecutableContent::StringId> &names,
-        const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+        const QList<QScxmlExecutableContent::StringId> &names,
+        const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
         QObject *parent)
     : QObject(*(new QScxmlInvokableServiceFactoryPrivate(invokeInfo, names, parameters)), parent)
 {}
@@ -200,14 +200,14 @@ const QScxmlExecutableContent::InvokeInfo &QScxmlInvokableServiceFactory::invoke
     return d->invokeInfo;
 }
 
-const QVector<QScxmlExecutableContent::ParameterInfo> &
+const QList<QScxmlExecutableContent::ParameterInfo> &
 QScxmlInvokableServiceFactory::parameters() const
 {
     Q_D(const QScxmlInvokableServiceFactory);
     return d->parameters;
 }
 
-const QVector<QScxmlExecutableContent::StringId> &QScxmlInvokableServiceFactory::names() const
+const QList<QScxmlExecutableContent::StringId> &QScxmlInvokableServiceFactory::names() const
 {
     Q_D(const QScxmlInvokableServiceFactory);
     return d->names;
@@ -259,8 +259,8 @@ QString QScxmlInvokableServicePrivate::calculateId(
 
 QVariantMap QScxmlInvokableServicePrivate::calculateData(
         QScxmlStateMachine *parent,
-        const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
-        const QVector<QScxmlExecutableContent::StringId> &names,
+        const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
+        const QList<QScxmlExecutableContent::StringId> &names,
         bool *ok) const
 {
     Q_ASSERT(ok);
@@ -404,8 +404,8 @@ QScxmlStateMachine *QScxmlScxmlService::stateMachine() const
  */
 QScxmlDynamicScxmlServiceFactory::QScxmlDynamicScxmlServiceFactory(
         const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-        const QVector<QScxmlExecutableContent::StringId> &names,
-        const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+        const QList<QScxmlExecutableContent::StringId> &names,
+        const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
         QObject *parent)
     : QScxmlInvokableServiceFactory(invokeInfo, names, parameters, parent)
 {}
@@ -427,8 +427,8 @@ QScxmlInvokableService *QScxmlDynamicScxmlServiceFactory::invoke(
 QScxmlStaticScxmlServiceFactory::QScxmlStaticScxmlServiceFactory(
         const QMetaObject *metaObject,
         const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-        const QVector<QScxmlExecutableContent::StringId> &nameList,
-        const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+        const QList<QScxmlExecutableContent::StringId> &nameList,
+        const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
         QObject *parent)
     : QScxmlInvokableServiceFactory(*(new QScxmlStaticScxmlServiceFactoryPrivate(
                                       metaObject, invokeInfo, nameList, parameters)), parent)
diff --git a/src/scxml/qscxmlinvokableservice.h b/src/scxml/qscxmlinvokableservice.h
index 65ce4fc..bdb6d7e 100644
--- a/src/scxml/qscxmlinvokableservice.h
+++ b/src/scxml/qscxmlinvokableservice.h
@@ -76,20 +76,20 @@ class Q_SCXML_EXPORT QScxmlInvokableServiceFactory : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QScxmlInvokableServiceFactory)
     Q_PROPERTY(QScxmlExecutableContent::InvokeInfo invokeInfo READ invokeInfo CONSTANT)
-    Q_PROPERTY(QVector<QScxmlExecutableContent::ParameterInfo> parameters READ parameters CONSTANT)
-    Q_PROPERTY(QVector<QScxmlExecutableContent::StringId> names READ names CONSTANT)
+    Q_PROPERTY(QList<QScxmlExecutableContent::ParameterInfo> parameters READ parameters CONSTANT)
+    Q_PROPERTY(QList<QScxmlExecutableContent::StringId> names READ names CONSTANT)
 
 public:
     QScxmlInvokableServiceFactory(
             const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-            const QVector<QScxmlExecutableContent::StringId> &names,
-            const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+            const QList<QScxmlExecutableContent::StringId> &names,
+            const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
             QObject *parent = nullptr);
 
     virtual QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) = 0;
     const QScxmlExecutableContent::InvokeInfo &invokeInfo() const;
-    const QVector<QScxmlExecutableContent::ParameterInfo> &parameters() const;
-    const QVector<QScxmlExecutableContent::StringId> &names() const;
+    const QList<QScxmlExecutableContent::ParameterInfo> &parameters() const;
+    const QList<QScxmlExecutableContent::StringId> &names() const;
 
 protected:
     QScxmlInvokableServiceFactory(QScxmlInvokableServiceFactoryPrivate &dd, QObject *parent);
@@ -104,8 +104,8 @@ public:
     QScxmlStaticScxmlServiceFactory(
             const QMetaObject *metaObject,
             const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-            const QVector<QScxmlExecutableContent::StringId> &nameList,
-            const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+            const QList<QScxmlExecutableContent::StringId> &nameList,
+            const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
             QObject *parent = nullptr);
 
     QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) override;
@@ -117,8 +117,8 @@ class Q_SCXML_EXPORT QScxmlDynamicScxmlServiceFactory: public QScxmlInvokableSer
 public:
     QScxmlDynamicScxmlServiceFactory(
             const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-            const QVector<QScxmlExecutableContent::StringId> &names,
-            const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+            const QList<QScxmlExecutableContent::StringId> &names,
+            const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
             QObject *parent = nullptr);
 
     QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) override;
diff --git a/src/scxml/qscxmlinvokableservice_p.h b/src/scxml/qscxmlinvokableservice_p.h
index dce1d64..f020f38 100644
--- a/src/scxml/qscxmlinvokableservice_p.h
+++ b/src/scxml/qscxmlinvokableservice_p.h
@@ -64,8 +64,8 @@ public:
     QString calculateId(QScxmlStateMachine *parent,
                         const QScxmlExecutableContent::InvokeInfo &invokeInfo, bool *ok) const;
     QVariantMap calculateData(QScxmlStateMachine *parent,
-                              const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
-                              const QVector<QScxmlExecutableContent::StringId> &names,
+                              const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
+                              const QList<QScxmlExecutableContent::StringId> &names,
                               bool *ok) const;
 
     QScxmlStateMachine *parentStateMachine;
@@ -76,12 +76,12 @@ class QScxmlInvokableServiceFactoryPrivate : public QObjectPrivate
 public:
     QScxmlInvokableServiceFactoryPrivate(
             const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-            const QVector<QScxmlExecutableContent::StringId> &names,
-            const QVector<QScxmlExecutableContent::ParameterInfo> &parameters);
+            const QList<QScxmlExecutableContent::StringId> &names,
+            const QList<QScxmlExecutableContent::ParameterInfo> &parameters);
 
     QScxmlExecutableContent::InvokeInfo invokeInfo;
-    QVector<QScxmlExecutableContent::StringId> names;
-    QVector<QScxmlExecutableContent::ParameterInfo> parameters;
+    QList<QScxmlExecutableContent::StringId> names;
+    QList<QScxmlExecutableContent::ParameterInfo> parameters;
 };
 
 class Q_SCXML_EXPORT QScxmlScxmlService: public QScxmlInvokableService
@@ -111,8 +111,8 @@ public:
     QScxmlStaticScxmlServiceFactoryPrivate(
             const QMetaObject *metaObject,
             const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-            const QVector<QScxmlExecutableContent::StringId> &names,
-            const QVector<QScxmlExecutableContent::ParameterInfo> &parameters);
+            const QList<QScxmlExecutableContent::StringId> &names,
+            const QList<QScxmlExecutableContent::ParameterInfo> &parameters);
 
     const QMetaObject *metaObject;
 };
diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp
index 23f8a71..819f6d1 100644
--- a/src/scxml/qscxmlstatemachine.cpp
+++ b/src/scxml/qscxmlstatemachine.cpp
@@ -1073,7 +1073,7 @@ void QScxmlStateMachinePrivate::exitStates(const OrderedSet &enabledTransitions)
     for (int s : statesToExitSorted) {
         for (int h : historyStates(s)) {
             const auto &hState = m_stateTable->state(h);
-            QVector<int> history;
+            QList<int> history;
 
             for (int s0 : m_configuration) {
                 const auto &s0State = m_stateTable->state(s0);
@@ -1100,7 +1100,7 @@ void QScxmlStateMachinePrivate::exitStates(const OrderedSet &enabledTransitions)
 
     if (m_infoSignalProxy) {
         emit m_infoSignalProxy->statesExited(
-                QVector<QScxmlStateMachineInfo::StateId>(statesToExitSorted.begin(),
+                QList<QScxmlStateMachineInfo::StateId>(statesToExitSorted.begin(),
                                                          statesToExitSorted.end()));
     }
 }
@@ -1132,7 +1132,7 @@ void QScxmlStateMachinePrivate::executeTransitionContent(const OrderedSet &enabl
 
     if (m_infoSignalProxy) {
         emit m_infoSignalProxy->transitionsTriggered(
-                QVector<QScxmlStateMachineInfo::TransitionId>(enabledTransitions.list().begin(),
+                QList<QScxmlStateMachineInfo::TransitionId>(enabledTransitions.list().begin(),
                                                               enabledTransitions.list().end()));
     }
 }
@@ -1196,7 +1196,7 @@ void QScxmlStateMachinePrivate::enterStates(const OrderedSet &enabledTransitions
         emitStateActive(s, true);
     if (m_infoSignalProxy) {
         emit m_infoSignalProxy->statesEntered(
-                QVector<QScxmlStateMachineInfo::StateId>(sortedStates.begin(),
+                QList<QScxmlStateMachineInfo::StateId>(sortedStates.begin(),
                                                          sortedStates.end()));
     }
 }
@@ -1507,10 +1507,10 @@ QScxmlStateMachine *QScxmlStateMachine::fromData(QIODevice *data, const QString
     return compiler.compile();
 }
 
-QVector<QScxmlError> QScxmlStateMachine::parseErrors() const
+QList<QScxmlError> QScxmlStateMachine::parseErrors() const
 {
     Q_D(const QScxmlStateMachine);
-    return d->m_parserData ? d->m_parserData->m_errors : QVector<QScxmlError>();
+    return d->m_parserData ? d->m_parserData->m_errors : QList<QScxmlError>();
 }
 
 QScxmlStateMachine::QScxmlStateMachine(const QMetaObject *metaObject, QObject *parent)
@@ -2229,11 +2229,11 @@ bool QScxmlStateMachine::isDispatchableTarget(const QString &target) const
     state machine (possibly recursively).
 */
 
-QVector<QScxmlInvokableService *> QScxmlStateMachine::invokedServices() const
+QList<QScxmlInvokableService *> QScxmlStateMachine::invokedServices() const
 {
     Q_D(const QScxmlStateMachine);
 
-    QVector<QScxmlInvokableService *> result;
+    QList<QScxmlInvokableService *> result;
     for (int i = 0, ei = int(d->m_invokedServices.size()); i != ei; ++i) {
         if (auto service = d->m_invokedServices[size_t(i)].service)
             result.append(service);
diff --git a/src/scxml/qscxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h
index 010268b..f875860 100644
--- a/src/scxml/qscxmlstatemachine.h
+++ b/src/scxml/qscxmlstatemachine.h
@@ -46,11 +46,11 @@
 #include <QtScxml/qscxmlcompiler.h>
 #include <QtScxml/qscxmlinvokableservice.h>
 
+#include <QtCore/qlist.h>
+#include <QtCore/qpointer.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/qpointer.h>
 
 #include <functional>
 
@@ -71,11 +71,11 @@ class Q_SCXML_EXPORT QScxmlStateMachine: public QObject
     Q_PROPERTY(bool initialized READ isInitialized NOTIFY initializedChanged)
     Q_PROPERTY(QScxmlDataModel *dataModel READ dataModel WRITE setDataModel NOTIFY dataModelChanged)
     Q_PROPERTY(QVariantMap initialValues READ initialValues WRITE setInitialValues NOTIFY initialValuesChanged)
-    Q_PROPERTY(QVector<QScxmlInvokableService*> invokedServices READ invokedServices NOTIFY invokedServicesChanged)
+    Q_PROPERTY(QList<QScxmlInvokableService*> invokedServices READ invokedServices NOTIFY invokedServicesChanged)
     Q_PROPERTY(QString sessionId READ sessionId CONSTANT)
     Q_PROPERTY(QString name READ name CONSTANT)
     Q_PROPERTY(bool invoked READ isInvoked CONSTANT)
-    Q_PROPERTY(QVector<QScxmlError> parseErrors READ parseErrors CONSTANT)
+    Q_PROPERTY(QList<QScxmlError> parseErrors READ parseErrors CONSTANT)
     Q_PROPERTY(QScxmlCompiler::Loader *loader READ loader WRITE setLoader NOTIFY loaderChanged)
     Q_PROPERTY(QScxmlTableData *tableData READ tableData WRITE setTableData NOTIFY tableDataChanged)
 
@@ -86,7 +86,7 @@ protected:
 public:
     static QScxmlStateMachine *fromFile(const QString &fileName);
     static QScxmlStateMachine *fromData(QIODevice *data, const QString &fileName = QString());
-    QVector<QScxmlError> parseErrors() const;
+    QList<QScxmlError> parseErrors() const;
 
     QString sessionId() const;
 
@@ -271,14 +271,14 @@ public:
 
     Q_INVOKABLE bool isDispatchableTarget(const QString &target) const;
 
-    QVector<QScxmlInvokableService *> invokedServices() const;
+    QList<QScxmlInvokableService *> invokedServices() const;
 
     QScxmlTableData *tableData() const;
     void setTableData(QScxmlTableData *tableData);
 
 Q_SIGNALS:
     void runningChanged(bool running);
-    void invokedServicesChanged(const QVector<QScxmlInvokableService *> &invokedServices);
+    void invokedServicesChanged(const QList<QScxmlInvokableService *> &invokedServices);
     void log(const QString &label, const QString &msg);
     void reachedStableState();
     void finished();
@@ -316,6 +316,6 @@ private:
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QScxmlStateMachine *)
-Q_DECLARE_METATYPE(QVector<QScxmlInvokableService *>)
+Q_DECLARE_METATYPE(QList<QScxmlInvokableService *>)
 
 #endif // QSCXMLSTATEMACHINE_H
diff --git a/src/scxml/qscxmlstatemachine_p.h b/src/scxml/qscxmlstatemachine_p.h
index 1c354fa..834ed07 100644
--- a/src/scxml/qscxmlstatemachine_p.h
+++ b/src/scxml/qscxmlstatemachine_p.h
@@ -113,9 +113,9 @@ public:
     {}
 
 Q_SIGNALS:
-    void statesEntered(const QVector<QScxmlStateMachineInfo::StateId> &states);
-    void statesExited(const QVector<QScxmlStateMachineInfo::StateId> &states);
-    void transitionsTriggered(const QVector<QScxmlStateMachineInfo::TransitionId> &transitions);
+    void statesEntered(const QList<QScxmlStateMachineInfo::StateId> &states);
+    void statesExited(const QList<QScxmlStateMachineInfo::StateId> &states);
+    void transitionsTriggered(const QList<QScxmlStateMachineInfo::TransitionId> &transitions);
 };
 } // QScxmlInternal namespace
 
@@ -152,7 +152,7 @@ public: // types
     {
     public:
         QScopedPointer<QScxmlDataModel> m_ownedDataModel;
-        QVector<QScxmlError> m_errors;
+        QList<QScxmlError> m_errors;
     };
 
     // The OrderedSet is a set where it elements are in insertion order. See
@@ -216,7 +216,7 @@ public: // types
 
     class Queue
     {
-        QVector<QScxmlEvent *> storage;
+        QList<QScxmlEvent *> storage;
 
     public:
         Queue()
@@ -346,7 +346,7 @@ public: // types & data fields:
 
 private:
     QScopedPointer<ParserData> m_parserData; // used when created by StateMachine::fromFile.
-    typedef QHash<int, QVector<int>> HistoryValues;
+    typedef QHash<int, QList<int>> HistoryValues;
     struct InvokedService {
         int invokingState;
         QScxmlInvokableService *service;
diff --git a/src/scxml/qscxmlstatemachineinfo.cpp b/src/scxml/qscxmlstatemachineinfo.cpp
index 4fbbecf..8bb1527 100644
--- a/src/scxml/qscxmlstatemachineinfo.cpp
+++ b/src/scxml/qscxmlstatemachineinfo.cpp
@@ -71,22 +71,22 @@ QScxmlStateMachine *QScxmlStateMachineInfo::stateMachine() const
     return d->stateMachine();
 }
 
-QVector<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::allStates() const
+QList<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::allStates() const
 {
     Q_D(const QScxmlStateMachineInfo);
 
-    QVector<QScxmlStateMachineInfo::StateId> all;
+    QList<QScxmlStateMachineInfo::StateId> all;
     for (int i = 0, ei = d->stateTable()->stateCount; i < ei; ++i) {
         all.append(i);
     }
     return all;
 }
 
-QVector<QScxmlStateMachineInfo::TransitionId> QScxmlStateMachineInfo::allTransitions() const
+QList<QScxmlStateMachineInfo::TransitionId> QScxmlStateMachineInfo::allTransitions() const
 {
     Q_D(const QScxmlStateMachineInfo);
 
-    QVector<QScxmlStateMachineInfo::TransitionId> all;
+    QList<QScxmlStateMachineInfo::TransitionId> all;
     for (int i = 0, ei = d->stateTable()->transitionCount; i < ei; ++i) {
         all.append(i);
     }
@@ -136,7 +136,7 @@ QScxmlStateMachineInfo::StateType QScxmlStateMachineInfo::stateType(StateId stat
     }
 }
 
-QVector<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::stateChildren(StateId stateId) const
+QList<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::stateChildren(StateId stateId) const
 {
     Q_D(const QScxmlStateMachineInfo);
 
@@ -146,7 +146,7 @@ QVector<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::stateChildren(S
     if (stateId >= 0 && stateId < d->stateTable()->stateCount)
         childStates = d->stateTable()->state(stateId).childStates;
 
-    QVector<QScxmlStateMachineInfo::StateId> all;
+    QList<QScxmlStateMachineInfo::StateId> all;
     if (childStates == QScxmlExecutableContent::StateTable::InvalidIndex)
         return all;
 
@@ -199,11 +199,11 @@ QScxmlStateMachineInfo::StateId QScxmlStateMachineInfo::transitionSource(Transit
     return transition.source;
 }
 
-QVector<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::transitionTargets(TransitionId transitionId) const
+QList<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::transitionTargets(TransitionId transitionId) const
 {
     Q_D(const QScxmlStateMachineInfo);
 
-    QVector<QScxmlStateMachineInfo::StateId> targets;
+    QList<QScxmlStateMachineInfo::StateId> targets;
     if (transitionId < 0 || transitionId >= d->stateTable()->transitionCount)
         return targets;
 
@@ -218,11 +218,11 @@ QVector<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::transitionTarge
     return targets;
 }
 
-QVector<QString> QScxmlStateMachineInfo::transitionEvents(TransitionId transitionId) const
+QList<QString> QScxmlStateMachineInfo::transitionEvents(TransitionId transitionId) const
 {
     Q_D(const QScxmlStateMachineInfo);
 
-    QVector<QString> events;
+    QList<QString> events;
     if (transitionId < 0 || transitionId >= d->stateTable()->transitionCount)
         return events;
 
@@ -239,11 +239,11 @@ QVector<QString> QScxmlStateMachineInfo::transitionEvents(TransitionId transitio
     return events;
 }
 
-QVector<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::configuration() const
+QList<QScxmlStateMachineInfo::StateId> QScxmlStateMachineInfo::configuration() const
 {
     Q_D(const QScxmlStateMachineInfo);
     const auto &list = d->stateMachinePrivate()->configuration().list();
-    return QVector<StateId>(list.cbegin(), list.cend());
+    return QList<StateId>(list.cbegin(), list.cend());
 }
 
 QT_END_NAMESPACE
diff --git a/src/scxml/qscxmlstatemachineinfo_p.h b/src/scxml/qscxmlstatemachineinfo_p.h
index 4fa0ca0..cb0c2e0 100644
--- a/src/scxml/qscxmlstatemachineinfo_p.h
+++ b/src/scxml/qscxmlstatemachineinfo_p.h
@@ -91,23 +91,23 @@ public: // methods
 
     QScxmlStateMachine *stateMachine() const;
 
-    QVector<StateId> allStates() const;
-    QVector<TransitionId> allTransitions() const;
+    QList<StateId> allStates() const;
+    QList<TransitionId> allTransitions() const;
     QString stateName(int stateId) const;
     StateId stateParent(StateId stateId) const;
     StateType stateType(int stateId) const;
-    QVector<StateId> stateChildren(StateId stateId) const;
+    QList<StateId> stateChildren(StateId stateId) const;
     TransitionId initialTransition(StateId stateId) const;
     TransitionType transitionType(TransitionId transitionId) const;
     StateId transitionSource(TransitionId transitionId) const;
-    QVector<StateId> transitionTargets(TransitionId transitionId) const;
-    QVector<QString> transitionEvents(TransitionId transitionId) const;
-    QVector<StateId> configuration() const;
+    QList<StateId> transitionTargets(TransitionId transitionId) const;
+    QList<QString> transitionEvents(TransitionId transitionId) const;
+    QList<StateId> configuration() const;
 
 Q_SIGNALS:
-    void statesEntered(const QVector<QScxmlStateMachineInfo::StateId> &states);
-    void statesExited(const QVector<QScxmlStateMachineInfo::StateId> &states);
-    void transitionsTriggered(const QVector<QScxmlStateMachineInfo::TransitionId> &transitions);
+    void statesEntered(const QList<QScxmlStateMachineInfo::StateId> &states);
+    void statesExited(const QList<QScxmlStateMachineInfo::StateId> &states);
+    void transitionsTriggered(const QList<QScxmlStateMachineInfo::TransitionId> &transitions);
 
 private:
     Q_DECLARE_PRIVATE(QScxmlStateMachineInfo)
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp
index ab63696..b95d2e4 100644
--- a/src/scxml/qscxmltabledata.cpp
+++ b/src/scxml/qscxmltabledata.cpp
@@ -183,7 +183,7 @@ public:
                 + (m_allTransitions.size() * transitionSize)
                 + m_arrays.size()
                 + 1;
-        QVector<qint32> data(dataSize, -1);
+        QList<qint32> data(dataSize, -1);
         qint32 *ptr = data.data();
 
         memcpy(ptr, &m_stateTable, sizeof(m_stateTable));
@@ -260,7 +260,7 @@ protected: // visitor
             endSequence();
         }
 
-        QVector<DocumentModel::AbstractState *> childStates;
+        QList<DocumentModel::AbstractState *> childStates;
         for (DocumentModel::StateOrTransition *sot : qAsConst(node->children)) {
             if (DocumentModel::AbstractState *s = sot->asAbstractState()) {
                 childStates.append(s);
@@ -317,13 +317,13 @@ protected: // visitor
         newState.entryInstructions = generate(state->onEntry);
         newState.exitInstructions = generate(state->onExit);
         if (!state->invokes.isEmpty()) {
-            QVector<int> factoryIds;
+            QList<int> factoryIds;
             for (DocumentModel::Invoke *invoke : qAsConst(state->invokes)) {
                 auto ctxt = createContext(QStringLiteral("invoke"));
-                QVector<QScxmlExecutableContent::StringId> namelist;
+                QList<QScxmlExecutableContent::StringId> namelist;
                 for (const QString &name : qAsConst(invoke->namelist))
                     namelist += addString(name);
-                QVector<QScxmlExecutableContent::ParameterInfo> params;
+                QList<QScxmlExecutableContent::ParameterInfo> params;
                 for (DocumentModel::Param *param : qAsConst(invoke->params)) {
                     QScxmlExecutableContent::ParameterInfo p;
                     p.name = addString(param->name);
@@ -361,7 +361,7 @@ protected: // visitor
 
         visit(state->children);
 
-        QVector<DocumentModel::AbstractState *> childStates;
+        QList<DocumentModel::AbstractState *> childStates;
         for (DocumentModel::StateOrTransition *sot : qAsConst(state->children)) {
             if (auto s = sot->asAbstractState()) {
                 childStates.append(s);
@@ -419,7 +419,7 @@ protected: // visitor
 
         newTransition.targets = addStates(transition->targetStates);
 
-        QVector<int> eventIds;
+        QList<int> eventIds;
         for (const QString &event : qAsConst(transition->events))
             eventIds.push_back(addString(event));
 
@@ -582,7 +582,7 @@ protected:
         return addString(createContextString(instrName));
     }
 
-    void generate(const QVector<DocumentModel::DataElement *> &dataElements)
+    void generate(const QList<DocumentModel::DataElement *> &dataElements)
     {
         for (DocumentModel::DataElement *el : dataElements) {
             auto ctxt = createContext(QStringLiteral("data"), QStringLiteral("expr"), el->expr);
@@ -605,7 +605,7 @@ protected:
         return id;
     }
 
-    void generate(Array<ParameterInfo> *out, const QVector<DocumentModel::Param *> &in)
+    void generate(Array<ParameterInfo> *out, const QList<DocumentModel::Param *> &in)
     {
         out->count = in.size();
         ParameterInfo *it = out->data();
@@ -742,7 +742,7 @@ protected:
         return NoEvaluator;
     }
 
-    GeneratedTableData *tableData(const QVector<int> &stateMachineTable);
+    GeneratedTableData *tableData(const QList<int> &stateMachineTable);
 
     StringId addString(const QString &str)
     { return str.isEmpty() ? NoString : m_stringTable.add(str); }
@@ -756,9 +756,9 @@ protected:
     bool isCppDataModel() const
     { return m_isCppDataModel; }
 
-    int addStates(const QVector<DocumentModel::AbstractState *> &states)
+    int addStates(const QList<DocumentModel::AbstractState *> &states)
     {
-        QVector<int> array;
+        QList<int> array;
         for (auto *s : states) {
             int si = m_docStatesIndices.value(s, -1);
             Q_ASSERT(si != -1);
@@ -768,7 +768,7 @@ protected:
         return addArray(array);
     }
 
-    int addArray(const QVector<int> &array)
+    int addArray(const QList<int> &array)
     {
         if (array.isEmpty())
             return -1;
@@ -894,7 +894,7 @@ private:
 
     class InstructionStorage {
     public:
-        InstructionStorage(QVector<qint32> &storage)
+        InstructionStorage(QList<qint32> &storage)
             : m_instr(storage)
             , m_info(nullptr)
         {}
@@ -932,36 +932,36 @@ private:
         }
 
     private:
-        QVector<qint32> &m_instr;
+        QList<qint32> &m_instr;
         SequenceInfo *m_info;
     };
 
-    QVector<SequenceInfo> m_activeSequences;
+    QList<SequenceInfo> m_activeSequences;
 
     GeneratedTableData::CreateFactoryId createFactoryId;
     GeneratedTableData &m_tableData;
     GeneratedTableData::DataModelInfo &m_dataModelInfo;
     Table<QStringList, QString, StringId> m_stringTable;
     InstructionStorage m_instructions;
-    Table<QVector<EvaluatorInfo>, EvaluatorInfo, EvaluatorId> m_evaluators;
-    Table<QVector<AssignmentInfo>, AssignmentInfo, EvaluatorId> m_assignments;
-    Table<QVector<ForeachInfo>, ForeachInfo, EvaluatorId> m_foreaches;
-    QVector<StringId> &m_dataIds;
+    Table<QList<EvaluatorInfo>, EvaluatorInfo, EvaluatorId> m_evaluators;
+    Table<QList<AssignmentInfo>, AssignmentInfo, EvaluatorId> m_assignments;
+    Table<QList<ForeachInfo>, ForeachInfo, EvaluatorId> m_foreaches;
+    QList<StringId> &m_dataIds;
     bool m_isCppDataModel = false;
 
     StateTable m_stateTable;
-    QVector<int> m_parents;
-    QVector<qint32> m_arrays;
+    QList<int> m_parents;
+    QList<qint32> m_arrays;
 
-    QVector<StateTable::Transition> m_allTransitions;
+    QList<StateTable::Transition> m_allTransitions;
     QHash<DocumentModel::Transition *, int> m_docTransitionIndices;
-    QVector<StateTable::State> m_allStates;
+    QList<StateTable::State> m_allStates;
     QHash<DocumentModel::AbstractState *, int> m_docStatesIndices;
-    QVector<QVector<int>> m_transitionsForState;
+    QList<QList<int>> m_transitionsForState;
 
     int m_currentTransition = StateTable::InvalidIndex;
     bool m_bindLate = false;
-    QVector<DocumentModel::DataElement *> m_dataElements;
+    QList<DocumentModel::DataElement *> m_dataElements;
     Table<QStringList, QString, int> m_stateNames;
 };
 
diff --git a/src/scxml/qscxmltabledata_p.h b/src/scxml/qscxmltabledata_p.h
index 47d8bac..a036b6f 100644
--- a/src/scxml/qscxmltabledata_p.h
+++ b/src/scxml/qscxmltabledata_p.h
@@ -52,9 +52,9 @@
 //
 
 #include <QtScxml/qscxmltabledata.h>
-#include <QtCore/qsharedpointer.h>
 #include <QtCore/qhash.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qsharedpointer.h>
 
 #include <functional>
 
@@ -72,8 +72,8 @@ class Q_SCXML_EXPORT GeneratedTableData: public QScxmlTableData
 public:
     typedef std::function<
         int(const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-            const QVector<QScxmlExecutableContent::StringId> &namelist,
-            const QVector<QScxmlExecutableContent::ParameterInfo> &params,
+            const QList<QScxmlExecutableContent::StringId> &namelist,
+            const QList<QScxmlExecutableContent::ParameterInfo> &params,
             QSharedPointer<DocumentModel::ScxmlDocument> content)
     > CreateFactoryId;
 
@@ -110,13 +110,13 @@ public:
     QScxmlInvokableServiceFactory *serviceFactory(int id) const override;
 
 public:
-    QVector<qint32> theStateMachineTable;
+    QList<qint32> theStateMachineTable;
     QStringList theStrings;
-    QVector<qint32> theInstructions;
-    QVector<QScxmlExecutableContent::EvaluatorInfo> theEvaluators;
-    QVector<QScxmlExecutableContent::AssignmentInfo> theAssignments;
-    QVector<QScxmlExecutableContent::ForeachInfo> theForeaches;
-    QVector<QScxmlExecutableContent::StringId> theDataNameIds;
+    QList<qint32> theInstructions;
+    QList<QScxmlExecutableContent::EvaluatorInfo> theEvaluators;
+    QList<QScxmlExecutableContent::AssignmentInfo> theAssignments;
+    QList<QScxmlExecutableContent::ForeachInfo> theForeaches;
+    QList<QScxmlExecutableContent::StringId> theDataNameIds;
     QScxmlExecutableContent::ContainerId theInitialSetup;
     int theName;
 };
diff --git a/tests/auto/compiled/tst_compiled.cpp b/tests/auto/compiled/tst_compiled.cpp
index 6382328..3d6c071 100644
--- a/tests/auto/compiled/tst_compiled.cpp
+++ b/tests/auto/compiled/tst_compiled.cpp
@@ -258,7 +258,7 @@ void tst_Compiled::topMachine()
     });
 
     QObject::connect(&stateMachine, &QScxmlStateMachine::invokedServicesChanged,
-                     [&invokableServicesCount](const QVector<QScxmlInvokableService *> &services) {
+                     [&invokableServicesCount](const QList<QScxmlInvokableService *> &services) {
         invokableServicesCount = services.count();
     });
 
@@ -283,7 +283,7 @@ void tst_Compiled::topMachineDynamic()
     });
 
     QObject::connect(stateMachine.data(), &QScxmlStateMachine::invokedServicesChanged,
-                     [&invokableServicesCount](const QVector<QScxmlInvokableService *> &services) {
+                     [&invokableServicesCount](const QList<QScxmlInvokableService *> &services) {
         invokableServicesCount = services.count();
     });
 
diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp
index 203dfaa..dad723e 100644
--- a/tests/auto/parser/tst_parser.cpp
+++ b/tests/auto/parser/tst_parser.cpp
@@ -73,7 +73,7 @@ void tst_Parser::error()
     QScopedPointer<QScxmlStateMachine> stateMachine(QScxmlStateMachine::fromFile(scxmlFileName));
     QVERIFY(!stateMachine.isNull());
 
-    const QVector<QScxmlError> errors = stateMachine->parseErrors();
+    const QList<QScxmlError> errors = stateMachine->parseErrors();
     if (errors.count() != expectedErrors.count()) {
         for (const QScxmlError &error : errors) {
             qDebug() << error.toString();
diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp
index 4bd4ef2..a7464b3 100644
--- a/tests/auto/statemachine/tst_statemachine.cpp
+++ b/tests/auto/statemachine/tst_statemachine.cpp
@@ -419,7 +419,7 @@ void tst_StateMachine::invokeStateMachine()
     QCOMPARE(stateMachine->isRunning(), true);
     QTRY_VERIFY(stateMachine->activeStateNames().contains(QString("anyplace")));
 
-    QVector<QScxmlInvokableService *> services = stateMachine->invokedServices();
+    QList<QScxmlInvokableService *> services = stateMachine->invokedServices();
     QCOMPARE(services.length(), 1);
     QVariant subMachineVariant = services[0]->property("stateMachine");
     QVERIFY(subMachineVariant.isValid());
diff --git a/tests/auto/statemachineinfo/tst_statemachineinfo.cpp b/tests/auto/statemachineinfo/tst_statemachineinfo.cpp
index a87e807..b03bc69 100644
--- a/tests/auto/statemachineinfo/tst_statemachineinfo.cpp
+++ b/tests/auto/statemachineinfo/tst_statemachineinfo.cpp
@@ -55,13 +55,13 @@ public:
     }
 
 public slots:
-    void statesEntered(const QVector<QScxmlStateMachineInfo::StateId> &states)
+    void statesEntered(const QList<QScxmlStateMachineInfo::StateId> &states)
     { entered = states; ++enterCount; }
 
-    void statesExited(const QVector<QScxmlStateMachineInfo::StateId> &states)
+    void statesExited(const QList<QScxmlStateMachineInfo::StateId> &states)
     { exited = states; ++exitCount; }
 
-    void transitionsTriggered(const QVector<QScxmlStateMachineInfo::TransitionId> &transitions)
+    void transitionsTriggered(const QList<QScxmlStateMachineInfo::TransitionId> &transitions)
     { this->transitions = transitions; ++transitionTriggerCount; }
 
     void reachedStableState()
@@ -79,11 +79,11 @@ public slots:
 
 public:
     int enterCount = 0;
-    QVector<QScxmlStateMachineInfo::StateId> entered;
+    QList<QScxmlStateMachineInfo::StateId> entered;
     int exitCount = 0;
-    QVector<QScxmlStateMachineInfo::StateId> exited;
+    QList<QScxmlStateMachineInfo::StateId> exited;
     int transitionTriggerCount = 0;
-    QVector<QScxmlStateMachineInfo::TransitionId> transitions;
+    QList<QScxmlStateMachineInfo::TransitionId> transitions;
     bool macroStepDone = false;
 };
 
@@ -121,12 +121,12 @@ void tst_StateMachineInfo::checkInfo()
     QCOMPARE(info->stateType(states.at(4)), QScxmlStateMachineInfo::FinalState);
 
     QCOMPARE(info->stateChildren(QScxmlStateMachineInfo::InvalidStateId),
-             QVector<int>() << 0 << 1 << 4);
-    QCOMPARE(info->stateChildren(states.at(0)), QVector<int>());
-    QCOMPARE(info->stateChildren(states.at(1)), QVector<int>() << 2 << 3);
-    QCOMPARE(info->stateChildren(states.at(2)), QVector<int>());
-    QCOMPARE(info->stateChildren(states.at(3)), QVector<int>());
-    QCOMPARE(info->stateChildren(states.at(4)), QVector<int>());
+             QList<int>() << 0 << 1 << 4);
+    QCOMPARE(info->stateChildren(states.at(0)), QList<int>());
+    QCOMPARE(info->stateChildren(states.at(1)), QList<int>() << 2 << 3);
+    QCOMPARE(info->stateChildren(states.at(2)), QList<int>());
+    QCOMPARE(info->stateChildren(states.at(3)), QList<int>());
+    QCOMPARE(info->stateChildren(states.at(4)), QList<int>());
 
     QCOMPARE(info->initialTransition(QScxmlStateMachineInfo::InvalidStateId), 4);
     QCOMPARE(info->initialTransition(states.at(0)), static_cast<int>(QScxmlStateMachineInfo::InvalidTransitionId));
@@ -199,7 +199,7 @@ void tst_StateMachineInfo::checkInfo()
     stateMachine->start();
     QVERIFY(recorder.finishMacroStep());
     QCOMPARE(recorder.enterCount, 1);
-    QCOMPARE(recorder.entered, QVector<QScxmlStateMachineInfo::StateId>() << 0);
+    QCOMPARE(recorder.entered, QList<QScxmlStateMachineInfo::StateId>() << 0);
     QVERIFY(recorder.exited.isEmpty());
 
     recorder.clear();
@@ -209,10 +209,10 @@ void tst_StateMachineInfo::checkInfo()
     stateMachine->submitEvent("step");
     QVERIFY(recorder.finishMacroStep());
     QCOMPARE(recorder.enterCount, 1);
-    QCOMPARE(recorder.entered, QVector<QScxmlStateMachineInfo::StateId>() << 1 << 2 << 3);
-    QCOMPARE(recorder.exited, QVector<QScxmlStateMachineInfo::StateId>() << 0);
+    QCOMPARE(recorder.entered, QList<QScxmlStateMachineInfo::StateId>() << 1 << 2 << 3);
+    QCOMPARE(recorder.exited, QList<QScxmlStateMachineInfo::StateId>() << 0);
     QCOMPARE(recorder.transitionTriggerCount, 1);
-    QCOMPARE(recorder.transitions, QVector<QScxmlStateMachineInfo::TransitionId>() << 1);
+    QCOMPARE(recorder.transitions, QList<QScxmlStateMachineInfo::TransitionId>() << 1);
 
     recorder.clear();
 
@@ -221,10 +221,10 @@ void tst_StateMachineInfo::checkInfo()
     stateMachine->submitEvent("step");
     QVERIFY(recorder.finishMacroStep());
     QCOMPARE(recorder.enterCount, 1);
-    QCOMPARE(recorder.entered, QVector<QScxmlStateMachineInfo::StateId>() << 4);
-    QCOMPARE(recorder.exited, QVector<QScxmlStateMachineInfo::StateId>() << 3 << 2 << 1);
+    QCOMPARE(recorder.entered, QList<QScxmlStateMachineInfo::StateId>() << 4);
+    QCOMPARE(recorder.exited, QList<QScxmlStateMachineInfo::StateId>() << 3 << 2 << 1);
     QCOMPARE(recorder.transitionTriggerCount, 1);
-    QCOMPARE(recorder.transitions, QVector<QScxmlStateMachineInfo::TransitionId>() << 2);
+    QCOMPARE(recorder.transitions, QList<QScxmlStateMachineInfo::TransitionId>() << 2);
 }
 
 
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp
index 220170a..210b546 100644
--- a/tools/qscxmlc/generator.cpp
+++ b/tools/qscxmlc/generator.cpp
@@ -166,7 +166,7 @@ bool Generator::registerableMetaType(const QByteArray &propertyType)
             return true;
     }
 
-    static const QVector<QByteArray> smartPointers = QVector<QByteArray>()
+    static const QList<QByteArray> smartPointers = QList<QByteArray>()
 #define STREAM_SMART_POINTER(SMART_POINTER) << #SMART_POINTER
         QT_FOR_EACH_AUTOMATIC_TEMPLATE_SMART_POINTER(STREAM_SMART_POINTER)
 #undef STREAM_SMART_POINTER
@@ -176,7 +176,7 @@ bool Generator::registerableMetaType(const QByteArray &propertyType)
         if (propertyType.startsWith(smartPointer + "<") && !propertyType.endsWith("&"))
             return knownQObjectClasses.contains(propertyType.mid(smartPointer.size() + 1, propertyType.size() - smartPointer.size() - 1 - 1));
 
-    static const QVector<QByteArray> oneArgTemplates = QVector<QByteArray>()
+    static const QList<QByteArray> oneArgTemplates = QList<QByteArray>()
 #define STREAM_1ARG_TEMPLATE(TEMPLATENAME) << #TEMPLATENAME
       QT_FOR_EACH_AUTOMATIC_TEMPLATE_1ARG(STREAM_1ARG_TEMPLATE)
 #undef STREAM_1ARG_TEMPLATE
diff --git a/tools/qscxmlc/generator.h b/tools/qscxmlc/generator.h
index e1f10eb..44229f5 100644
--- a/tools/qscxmlc/generator.h
+++ b/tools/qscxmlc/generator.h
@@ -31,7 +31,7 @@
 
 #include "moc.h"
 #include <QtCore/qhash.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qiodevice.h>
 
 QT_BEGIN_NAMESPACE
@@ -40,7 +40,7 @@ class Generator
 {
     QIODevice &out;
     ClassDef *cdef;
-    QVector<uint> meta_data;
+    QList<uint> meta_data;
 public:
     Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes, const QHash<QByteArray,
               QByteArray> &knownQObjectClasses, const QHash<QByteArray, QByteArray> &knownGadgets,
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index fa6359e..f26217a 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -365,8 +365,8 @@ void generateCppDataModelEvaluators(const GeneratedTableData::DataModelInfo &inf
 int createFactoryId(QStringList &factories, const QString &className,
                     const QString &namespacePrefix,
                     const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-                    const QVector<QScxmlExecutableContent::StringId> &namelist,
-                    const QVector<QScxmlExecutableContent::ParameterInfo> &parameters)
+                    const QList<QScxmlExecutableContent::StringId> &namelist,
+                    const QList<QScxmlExecutableContent::ParameterInfo> &parameters)
 {
     const int idx = factories.size();
 
@@ -421,10 +421,10 @@ void CppDumper::dump(TranslationUnit *unit)
     }
 
     QStringList classNames;
-    QVector<GeneratedTableData> tables;
-    QVector<GeneratedTableData::MetaDataInfo> metaDataInfos;
-    QVector<GeneratedTableData::DataModelInfo> dataModelInfos;
-    QVector<QStringList> factories;
+    QList<GeneratedTableData> tables;
+    QList<GeneratedTableData::MetaDataInfo> metaDataInfos;
+    QList<GeneratedTableData::DataModelInfo> dataModelInfos;
+    QList<QStringList> factories;
     auto docs = m_translationUnit->allDocuments;
     tables.resize(docs.size());
     metaDataInfos.resize(tables.size());
@@ -438,8 +438,8 @@ void CppDumper::dump(TranslationUnit *unit)
         GeneratedTableData::build(doc, &tables[i], metaDataInfo, &dataModelInfos[i],
                                   [this, &factories, i, &classnameForDocument, &namespacePrefix](
                 const QScxmlExecutableContent::InvokeInfo &invokeInfo,
-                const QVector<QScxmlExecutableContent::StringId> &names,
-                const QVector<QScxmlExecutableContent::ParameterInfo> &parameters,
+                const QList<QScxmlExecutableContent::StringId> &names,
+                const QList<QScxmlExecutableContent::ParameterInfo> &parameters,
                 const QSharedPointer<DocumentModel::ScxmlDocument> &content) -> int {
             QString className;
             if (invokeInfo.expr == QScxmlExecutableContent::NoEvaluator) {