Use QList instead of QVector

Task-number: QTBUG-84469
Task-number: QTBUG-90907
Change-Id: Ifc6f05fb5e17e32ec04b383770080e812c854510
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

32 files changed, 277 insertions, 279 deletions

diff --git a/examples/remoteobjects/modelviewserver/main.cpp b/examples/remoteobjects/modelviewserver/main.cpp
index 55c59ab..e0baaac 100644
--- a/examples/remoteobjects/modelviewserver/main.cpp
+++ b/examples/remoteobjects/modelviewserver/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
     };
     sourceModel.setItemRoleNames(roleNames);
 
-    QVector<int> roles;
+    QList<int> roles;
     roles << Qt::DisplayRole << Qt::BackgroundRole;
 
     qDebug() << "Creating registry host";
diff --git a/examples/remoteobjects/websockets/wsserver/main.cpp b/examples/remoteobjects/websockets/wsserver/main.cpp
index 26bbc02..698778c 100644
--- a/examples/remoteobjects/websockets/wsserver/main.cpp
+++ b/examples/remoteobjects/websockets/wsserver/main.cpp
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     };
     sourceModel.setItemRoleNames(roleNames);
 
-    QVector<int> roles;
+    QList<int> roles;
     roles << Qt::DisplayRole << Qt::BackgroundRole;
 
     QWebSocketServer webSockServer{QStringLiteral("WS QtRO"), QWebSocketServer::NonSecureMode};
diff --git a/src/remoteobjects/qconnection_qnx_server.cpp b/src/remoteobjects/qconnection_qnx_server.cpp
index 62433e6..eb4e75f 100644
--- a/src/remoteobjects/qconnection_qnx_server.cpp
+++ b/src/remoteobjects/qconnection_qnx_server.cpp
@@ -150,7 +150,7 @@ void QQnxNativeServerPrivate::thread_func()
 {
     struct _msg_info msg_info;
     recv_msgs recv_buf;
-    QVector<iov_t> resp_repeat_iov(5);
+    QList<iov_t> resp_repeat_iov(5);
 
     qCDebug(QT_REMOTEOBJECT) << "Server thread_func running";
 
@@ -324,7 +324,7 @@ void QQnxNativeServerPrivate::thread_func()
 
             int len_taken = 0;
             const int to_send = msg_info.dstmsglen - sizeof(int); //Exclude the buffer count
-            QVector<QByteArray> qba_array;
+            QByteArrayList qba_array;
             io->d_func()->obLock.lockForWrite(); //NAR (Not-An-Error)
             qCDebug(QT_REMOTEOBJECT) << "server received SOURCE_TX_RESP_REPEAT with length" << msg_info.dstmsglen << "Available:" << io->d_func()->obuffer.size();
             while (len_taken != to_send)
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp b/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp
index 349f1dc..a615216 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp
+++ b/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qitemselectionmodel.h>
 
 // consider evaluating performance difference with item data
-inline QVariantList collectData(const QModelIndex &index, const QAbstractItemModel *model, const QVector<int> &roles)
+inline QVariantList collectData(const QModelIndex &index, const QAbstractItemModel *model, const QList<int> &roles)
 {
     QVariantList result;
     result.reserve(roles.size());
@@ -51,12 +51,12 @@ inline QVariantList collectData(const QModelIndex &index, const QAbstractItemMod
     return result;
 }
 
-inline QVector<int> filterRoles(const QVector<int> &roles, const QVector<int> &availableRoles)
+inline QList<int> filterRoles(const QList<int> &roles, const QList<int> &availableRoles)
 {
     if (roles.isEmpty())
         return availableRoles;
 
-    QVector<int> neededRoles;
+    QList<int> neededRoles;
     for (int inRole : roles) {
         for (int availableRole : availableRoles)
             if (inRole == availableRole) {
@@ -67,14 +67,14 @@ inline QVector<int> filterRoles(const QVector<int> &roles, const QVector<int> &a
     return neededRoles;
 }
 
-QAbstractItemModelSourceAdapter::QAbstractItemModelSourceAdapter(QAbstractItemModel *obj, QItemSelectionModel *sel, const QVector<int> &roles)
+QAbstractItemModelSourceAdapter::QAbstractItemModelSourceAdapter(QAbstractItemModel *obj, QItemSelectionModel *sel, const QList<int> &roles)
     : QObject(obj),
       m_model(obj),
       m_availableRoles(roles)
 {
     QAbstractItemModelSourceAdapter::registerTypes();
     m_selectionModel = sel;
-    connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(sourceDataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), this, SLOT(sourceDataChanged(QModelIndex,QModelIndex,QList<int>)));
     connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(sourceColumnsInserted(QModelIndex,int,int)));
     connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
@@ -92,7 +92,7 @@ void QAbstractItemModelSourceAdapter::registerTypes()
     alreadyRegistered = true;
     qRegisterMetaType<QAbstractItemModel*>();
     qRegisterMetaType<Qt::Orientation>();
-    qRegisterMetaType<QVector<Qt::Orientation>>();
+    qRegisterMetaType<QList<Qt::Orientation>>();
     qRegisterMetaType<ModelIndex>();
     qRegisterMetaType<IndexList>();
     qRegisterMetaType<DataEntries>();
@@ -126,7 +126,7 @@ void QAbstractItemModelSourceAdapter::replicaSetData(const IndexList &index, con
     Q_UNUSED(result);
 }
 
-DataEntries QAbstractItemModelSourceAdapter::replicaRowRequest(IndexList start, IndexList end, QVector<int> roles)
+DataEntries QAbstractItemModelSourceAdapter::replicaRowRequest(IndexList start, IndexList end, QList<int> roles)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << "Requested rows" << "start=" << start << "end=" << end << "roles=" << roles;
 
@@ -169,7 +169,7 @@ DataEntries QAbstractItemModelSourceAdapter::replicaRowRequest(IndexList start,
     return entries;
 }
 
-MetaAndDataEntries QAbstractItemModelSourceAdapter::replicaCacheRequest(size_t size, const QVector<int> &roles)
+MetaAndDataEntries QAbstractItemModelSourceAdapter::replicaCacheRequest(size_t size, const QList<int> &roles)
 {
     MetaAndDataEntries res;
     res.roles = roles.isEmpty() ? m_availableRoles : roles;
@@ -180,7 +180,7 @@ MetaAndDataEntries QAbstractItemModelSourceAdapter::replicaCacheRequest(size_t s
     return res;
 }
 
-QVariantList QAbstractItemModelSourceAdapter::replicaHeaderRequest(QVector<Qt::Orientation> orientations, QVector<int> sections, QVector<int> roles)
+QVariantList QAbstractItemModelSourceAdapter::replicaHeaderRequest(QList<Qt::Orientation> orientations, QList<int> sections, QList<int> roles)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "orientations=" << orientations << "sections=" << sections << "roles=" << roles;
     QVariantList data;
@@ -198,9 +198,9 @@ void QAbstractItemModelSourceAdapter::replicaSetCurrentIndex(IndexList index, QI
         m_selectionModel->setCurrentIndex(toQModelIndex(index, m_model), command);
 }
 
-void QAbstractItemModelSourceAdapter::sourceDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector<int> & roles) const
+void QAbstractItemModelSourceAdapter::sourceDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, const QList<int> & roles) const
 {
-    QVector<int> neededRoles = filterRoles(roles, availableRoles());
+    QList<int> neededRoles = filterRoles(roles, availableRoles());
     if (neededRoles.isEmpty()) {
         qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "Needed roles is empty!";
         return;
@@ -244,9 +244,9 @@ void QAbstractItemModelSourceAdapter::sourceCurrentChanged(const QModelIndex & c
     emit currentChanged(currentIndex, previousIndex);
 }
 
-QVector<IndexValuePair> QAbstractItemModelSourceAdapter::fetchTree(const QModelIndex &parent, size_t &size, const QVector<int> &roles)
+QList<IndexValuePair> QAbstractItemModelSourceAdapter::fetchTree(const QModelIndex &parent, size_t &size, const QList<int> &roles)
 {
-    QVector<IndexValuePair> entries;
+    QList<IndexValuePair> entries;
     const int rowCount = m_model->rowCount(parent);
     const int columnCount = m_model->columnCount(parent);
     if (!columnCount || !rowCount)
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h b/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
index 8eff2c5..d789b36 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
@@ -65,15 +65,15 @@ class QAbstractItemModelSourceAdapter : public QObject
 {
     Q_OBJECT
 public:
-    Q_INVOKABLE explicit QAbstractItemModelSourceAdapter(QAbstractItemModel *object, QItemSelectionModel *sel, const QVector<int> &roles = QVector<int>());
-    Q_PROPERTY(QVector<int> availableRoles READ availableRoles WRITE setAvailableRoles NOTIFY availableRolesChanged)
+    Q_INVOKABLE explicit QAbstractItemModelSourceAdapter(QAbstractItemModel *object, QItemSelectionModel *sel, const QList<int> &roles = QList<int>());
+    Q_PROPERTY(QList<int> availableRoles READ availableRoles WRITE setAvailableRoles NOTIFY availableRolesChanged)
     Q_PROPERTY(QIntHash roleNames READ roleNames)
     static void registerTypes();
     QItemSelectionModel* selectionModel() const;
 
 public Q_SLOTS:
-    QVector<int> availableRoles() const { return m_availableRoles; }
-    void setAvailableRoles(QVector<int> availableRoles)
+    QList<int> availableRoles() const { return m_availableRoles; }
+    void setAvailableRoles(QList<int> availableRoles)
     {
         if (availableRoles != m_availableRoles)
         {
@@ -85,13 +85,13 @@ public Q_SLOTS:
     QIntHash roleNames() const {return m_model->roleNames();}
 
     QSize replicaSizeRequest(IndexList parentList);
-    DataEntries replicaRowRequest(IndexList start, IndexList end, QVector<int> roles);
-    QVariantList replicaHeaderRequest(QVector<Qt::Orientation> orientations, QVector<int> sections, QVector<int> roles);
+    DataEntries replicaRowRequest(IndexList start, IndexList end, QList<int> roles);
+    QVariantList replicaHeaderRequest(QList<Qt::Orientation> orientations, QList<int> sections, QList<int> roles);
     void replicaSetCurrentIndex(IndexList index, QItemSelectionModel::SelectionFlags command);
     void replicaSetData(const IndexList &index, const QVariant &value, int role);
-    MetaAndDataEntries replicaCacheRequest(size_t size, const QVector<int> &roles);
+    MetaAndDataEntries replicaCacheRequest(size_t size, const QList<int> &roles);
 
-    void sourceDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector<int> & roles = QVector<int> ()) const;
+    void sourceDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, const QList<int> & roles = QList<int> ()) const;
     void sourceRowsInserted(const QModelIndex & parent, int start, int end);
     void sourceColumnsInserted(const QModelIndex & parent, int start, int end);
     void sourceRowsRemoved(const QModelIndex & parent, int start, int end);
@@ -100,7 +100,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void availableRolesChanged();
-    void dataChanged(IndexList topLeft, IndexList bottomRight, QVector<int> roles) const;
+    void dataChanged(IndexList topLeft, IndexList bottomRight, QList<int> roles) const;
     void rowsInserted(IndexList parent, int start, int end) const;
     void rowsRemoved(IndexList parent, int start, int end) const;
     void rowsMoved(IndexList sourceParent, int sourceRow, int count, IndexList destinationParent, int destinationChild) const;
@@ -109,11 +109,11 @@ Q_SIGNALS:
 
 private:
     QAbstractItemModelSourceAdapter();
-    QVector<IndexValuePair> fetchTree(const QModelIndex &parent, size_t &size, const QVector<int> &roles);
+    QList<IndexValuePair> fetchTree(const QModelIndex &parent, size_t &size, const QList<int> &roles);
 
     QAbstractItemModel *m_model;
     QItemSelectionModel *m_selectionModel;
-    QVector<int> m_availableRoles;
+    QList<int> m_availableRoles;
 };
 
 template <class ObjectType, class AdapterType>
@@ -126,11 +126,11 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         , m_name(name)
     {
         m_properties[0] = 2;
-        m_properties[1] = QtPrivate::qtro_property_index<AdapterType>(&AdapterType::availableRoles, static_cast<QVector<int> (QObject::*)()>(0),"availableRoles");
+        m_properties[1] = QtPrivate::qtro_property_index<AdapterType>(&AdapterType::availableRoles, static_cast<QList<int> (QObject::*)()>(0),"availableRoles");
         m_properties[2] = QtPrivate::qtro_property_index<AdapterType>(&AdapterType::roleNames, static_cast<QIntHash (QObject::*)()>(0),"roleNames");
         m_signals[0] = 9;
         m_signals[1] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::availableRolesChanged, static_cast<void (QObject::*)()>(0),m_signalArgCount+0,&m_signalArgTypes[0]);
-        m_signals[2] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::dataChanged, static_cast<void (QObject::*)(IndexList,IndexList,QVector<int>)>(0),m_signalArgCount+1,&m_signalArgTypes[1]);
+        m_signals[2] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::dataChanged, static_cast<void (QObject::*)(IndexList,IndexList,QList<int>)>(0),m_signalArgCount+1,&m_signalArgTypes[1]);
         m_signals[3] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::rowsInserted, static_cast<void (QObject::*)(IndexList,int,int)>(0),m_signalArgCount+2,&m_signalArgTypes[2]);
         m_signals[4] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::rowsRemoved, static_cast<void (QObject::*)(IndexList,int,int)>(0),m_signalArgCount+3,&m_signalArgTypes[3]);
         m_signals[5] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::rowsMoved, static_cast<void (QObject::*)(IndexList,int,int,IndexList,int)>(0),m_signalArgCount+4,&m_signalArgTypes[4]);
@@ -140,11 +140,11 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         m_signals[9] = QtPrivate::qtro_signal_index<AdapterType>(&AdapterType::columnsInserted, static_cast<void (QObject::*)(IndexList,int,int)>(0),m_signalArgCount+8,&m_signalArgTypes[8]);
         m_methods[0] = 6;
         m_methods[1] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaSizeRequest, static_cast<void (QObject::*)(IndexList)>(0),"replicaSizeRequest(IndexList)",m_methodArgCount+0,&m_methodArgTypes[0]);
-        m_methods[2] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaRowRequest, static_cast<void (QObject::*)(IndexList,IndexList,QVector<int>)>(0),"replicaRowRequest(IndexList,IndexList,QVector<int>)",m_methodArgCount+1,&m_methodArgTypes[1]);
-        m_methods[3] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaHeaderRequest, static_cast<void (QObject::*)(QVector<Qt::Orientation>,QVector<int>,QVector<int>)>(0),"replicaHeaderRequest(QVector<Qt::Orientation>,QVector<int>,QVector<int>)",m_methodArgCount+2,&m_methodArgTypes[2]);
+        m_methods[2] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaRowRequest, static_cast<void (QObject::*)(IndexList,IndexList,QList<int>)>(0),"replicaRowRequest(IndexList,IndexList,QList<int>)",m_methodArgCount+1,&m_methodArgTypes[1]);
+        m_methods[3] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaHeaderRequest, static_cast<void (QObject::*)(QList<Qt::Orientation>,QList<int>,QList<int>)>(0),"replicaHeaderRequest(QList<Qt::Orientation>,QList<int>,QList<int>)",m_methodArgCount+2,&m_methodArgTypes[2]);
         m_methods[4] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaSetCurrentIndex, static_cast<void (QObject::*)(IndexList,QItemSelectionModel::SelectionFlags)>(0),"replicaSetCurrentIndex(IndexList,QItemSelectionModel::SelectionFlags)",m_methodArgCount+3,&m_methodArgTypes[3]);
         m_methods[5] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaSetData, static_cast<void (QObject::*)(IndexList,QVariant,int)>(0),"replicaSetData(IndexList,QVariant,int)",m_methodArgCount+4,&m_methodArgTypes[4]);
-        m_methods[6] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaCacheRequest, static_cast<void (QObject::*)(size_t,QVector<int>)>(0),"replicaCacheRequest(size_t,QVector<int>)",m_methodArgCount+5,&m_methodArgTypes[5]);
+        m_methods[6] = QtPrivate::qtro_method_index<AdapterType>(&AdapterType::replicaCacheRequest, static_cast<void (QObject::*)(size_t,QList<int>)>(0),"replicaCacheRequest(size_t,QList<int>)",m_methodArgCount+5,&m_methodArgTypes[5]);
     }
 
     QString name() const override { return m_name; }
@@ -179,9 +179,9 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
     int signalParameterType(int sigIndex, int paramIndex) const override { return m_signalArgTypes[sigIndex][paramIndex]; }
     int methodParameterCount(int index) const override { return m_methodArgCount[index]; }
     int methodParameterType(int methodIndex, int paramIndex) const override { return m_methodArgTypes[methodIndex][paramIndex]; }
-    QList<QByteArray> signalParameterNames(int index) const override
+    QByteArrayList signalParameterNames(int index) const override
     {
-        QList<QByteArray> res;
+        QByteArrayList res;
         int count = signalParameterCount(index);
         while (count--)
             res << QByteArray{};
@@ -205,7 +205,7 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
     {
         switch (index) {
         case 0: return QByteArrayLiteral("availableRolesChanged()");
-        case 1: return QByteArrayLiteral("dataChanged(IndexList,IndexList,QVector<int>)");
+        case 1: return QByteArrayLiteral("dataChanged(IndexList,IndexList,QList<int>)");
         case 2: return QByteArrayLiteral("rowsInserted(IndexList,int,int)");
         case 3: return QByteArrayLiteral("rowsRemoved(IndexList,int,int)");
         case 4: return QByteArrayLiteral("rowsMoved(IndexList,int,int,IndexList,int)");
@@ -220,11 +220,11 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
     {
         switch (index) {
         case 0: return QByteArrayLiteral("replicaSizeRequest(IndexList)");
-        case 1: return QByteArrayLiteral("replicaRowRequest(IndexList,IndexList,QVector<int>)");
-        case 2: return QByteArrayLiteral("replicaHeaderRequest(QVector<Qt::Orientation>,QVector<int>,QVector<int>)");
+        case 1: return QByteArrayLiteral("replicaRowRequest(IndexList,IndexList,QList<int>)");
+        case 2: return QByteArrayLiteral("replicaHeaderRequest(QList<Qt::Orientation>,QList<int>,QList<int>)");
         case 3: return QByteArrayLiteral("replicaSetCurrentIndex(IndexList,QItemSelectionModel::SelectionFlags)");
         case 4: return QByteArrayLiteral("replicaSetData(IndexList,QVariant,int)");
-        case 5: return QByteArrayLiteral("replicaCacheRequest(size_t,QVector<int>)");
+        case 5: return QByteArrayLiteral("replicaCacheRequest(size_t,QList<int>)");
         }
         return QByteArrayLiteral("");
     }
@@ -244,9 +244,9 @@ struct QAbstractItemAdapterSourceAPI : public SourceApiMap
         return QByteArrayLiteral("");
     }
 
-    QList<QByteArray> methodParameterNames(int index) const override
+    QByteArrayList methodParameterNames(int index) const override
     {
-        QList<QByteArray> res;
+        QByteArrayList res;
         int count = methodParameterCount(index);
         while (count--)
             res << QByteArray{};
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp
index 9c306f5..143e961 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp
@@ -103,7 +103,7 @@ QAbstractItemModelReplicaImplementation::~QAbstractItemModelReplicaImplementatio
 void QAbstractItemModelReplicaImplementation::initialize()
 {
     QVariantList properties;
-    properties << QVariant::fromValue(QVector<int>());
+    properties << QVariant::fromValue(QList<int>());
     properties << QVariant::fromValue(QIntHash());
     setProperties(properties);
 }
@@ -117,7 +117,7 @@ void QAbstractItemModelReplicaImplementation::registerMetatypes()
     alreadyRegistered = true;
     qRegisterMetaType<QAbstractItemModel*>();
     qRegisterMetaType<Qt::Orientation>();
-    qRegisterMetaType<QVector<Qt::Orientation>>();
+    qRegisterMetaType<QList<Qt::Orientation>>();
     qRegisterMetaType<ModelIndex>();
     qRegisterMetaType<IndexList>();
     qRegisterMetaType<DataEntries>();
@@ -139,7 +139,7 @@ void QAbstractItemModelReplicaImplementation::initializeModelConnections()
     connect(this, &QAbstractItemModelReplicaImplementation::headerDataChanged, this, &QAbstractItemModelReplicaImplementation::onHeaderDataChanged);
 }
 
-inline void removeIndexFromRow(const QModelIndex &index, const QVector<int> &roles, CachedRowEntry *entry)
+inline void removeIndexFromRow(const QModelIndex &index, const QList<int> &roles, CachedRowEntry *entry)
 {
     CachedRowEntry &entryRef = *entry;
     if (index.column() < entryRef.size()) {
@@ -169,7 +169,7 @@ void QAbstractItemModelReplicaImplementation::setModel(QAbstractItemModelReplica
     connect(m_selectionModel.data(), &QItemSelectionModel::currentChanged, this, &QAbstractItemModelReplicaImplementation::onReplicaCurrentChanged);
 }
 
-bool QAbstractItemModelReplicaImplementation::clearCache(const IndexList &start, const IndexList &end, const QVector<int> &roles = QVector<int>())
+bool QAbstractItemModelReplicaImplementation::clearCache(const IndexList &start, const IndexList &end, const QList<int> &roles = QList<int>())
 {
     Q_ASSERT(start.size() == end.size());
 
@@ -203,7 +203,7 @@ bool QAbstractItemModelReplicaImplementation::clearCache(const IndexList &start,
     return true;
 }
 
-void QAbstractItemModelReplicaImplementation::onDataChanged(const IndexList &start, const IndexList &end, const QVector<int> &roles)
+void QAbstractItemModelReplicaImplementation::onDataChanged(const IndexList &start, const IndexList &end, const QList<int> &roles)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "start=" << start << "end=" << end << "roles=" << roles;
 
@@ -380,12 +380,12 @@ void QAbstractItemModelReplicaImplementation::handleModelResetDone(QRemoteObject
     m_headerData[0].resize(size.width());
     m_headerData[1].resize(size.height());
     {
-        QVector<CacheEntry> &headerEntries = m_headerData[0];
+        QList<CacheEntry> &headerEntries = m_headerData[0];
         for (int i = 0; i < size.width(); ++i )
             headerEntries[i].data.clear();
     }
     {
-        QVector<CacheEntry> &headerEntries = m_headerData[1];
+        QList<CacheEntry> &headerEntries = m_headerData[1];
         for (int i = 0; i < size.height(); ++i )
             headerEntries[i].data.clear();
     }
@@ -457,7 +457,7 @@ QRemoteObjectPendingCallWatcher* QAbstractItemModelReplicaImplementation::doMode
     return watcher;
 }
 
-inline void fillCacheEntry(CacheEntry *entry, const IndexValuePair &pair, const QVector<int> &roles)
+inline void fillCacheEntry(CacheEntry *entry, const IndexValuePair &pair, const QList<int> &roles)
 {
     Q_ASSERT(entry);
 
@@ -475,7 +475,7 @@ inline void fillCacheEntry(CacheEntry *entry, const IndexValuePair &pair, const
     }
 }
 
-inline void fillRow(CacheData *item, const IndexValuePair &pair, const QAbstractItemModel *model, const QVector<int> &roles)
+inline void fillRow(CacheData *item, const IndexValuePair &pair, const QAbstractItemModel *model, const QList<int> &roles)
 {
     CachedRowEntry &rowRef = item->cachedRowEntry;
     const QModelIndex index = toQModelIndex(pair.index, model);
@@ -513,7 +513,7 @@ int collectEntriesForRow(DataEntries* filteredEntries, int row, const DataEntrie
     return size;
 }
 
-void QAbstractItemModelReplicaImplementation::fillCache(const IndexValuePair &pair, const QVector<int> &roles)
+void QAbstractItemModelReplicaImplementation::fillCache(const IndexValuePair &pair, const QList<int> &roles)
 {
     if (auto item = createCacheData(pair.index)) {
         fillRow(item, pair, q, roles);
@@ -604,7 +604,7 @@ void QAbstractItemModelReplicaImplementation::fetchPendingData()
             const ModelIndex dataIndEnd = data.end.last();
             const ModelIndex resStart(std::min(curIndStart.row, dataIndStart.row), std::min(curIndStart.column, dataIndStart.column));
             const ModelIndex resEnd(std::max(curIndEnd.row, dataIndEnd.row), std::max(curIndEnd.column, dataIndEnd.column));
-            QVector<int> roles = curData.roles;
+            QList<int> roles = curData.roles;
             if (!curData.roles.isEmpty()) {
                 for (int role : data.roles) {
                     if (!curData.roles.contains(role))
@@ -666,7 +666,7 @@ void QAbstractItemModelReplicaImplementation::onHeaderDataChanged(Qt::Orientatio
 {
     // TODO clean cache
     const int index = orientation == Qt::Horizontal ? 0 : 1;
-    QVector<CacheEntry> &entries = m_headerData[index];
+    QList<CacheEntry> &entries = m_headerData[index];
     for (int i = first; i < last; ++i )
         entries[i].data.clear();
     emit q->headerDataChanged(orientation, first, last);
@@ -674,9 +674,9 @@ void QAbstractItemModelReplicaImplementation::onHeaderDataChanged(Qt::Orientatio
 
 void QAbstractItemModelReplicaImplementation::fetchPendingHeaderData()
 {
-    QVector<int> roles;
-    QVector<int> sections;
-    QVector<Qt::Orientation> orientations;
+    QList<int> roles;
+    QList<int> sections;
+    QList<Qt::Orientation> orientations;
     for (const RequestedHeaderData &data : qAsConst(m_requestedHeaderData)) {
         roles.push_back(data.role);
         sections.push_back(data.section);
@@ -689,14 +689,14 @@ void QAbstractItemModelReplicaImplementation::fetchPendingHeaderData()
     m_pendingRequests.push_back(watcher);
 }
 
-static inline QVector<QPair<int, int> > listRanges(const QVector<int> &list)
+static inline QList<QPair<int, int>> listRanges(const QList<int> &list)
 {
-    QVector<QPair<int, int> > result;
+    QList<QPair<int, int>> result;
     if (!list.isEmpty()) {
         QPair<int, int> currentElem = qMakePair(list.first(), list.first());
-        QVector<int>::const_iterator end = list.end();
-        for (QVector<int>::const_iterator it = list.constBegin() + 1; it != end; ++it) {
-            if (currentElem.first == *it +1)
+        const auto end = list.constEnd();
+        for (auto it = list.constBegin() + 1; it != end; ++it) {
+            if (currentElem.first == *it + 1)
                 currentElem.first = *it;
             else if ( currentElem.second == *it -1)
                 currentElem.second = *it;
@@ -722,8 +722,8 @@ void QAbstractItemModelReplicaImplementation::requestedHeaderData(QRemoteObjectP
     Q_ASSERT(watcher->orientations.size() == data.size());
     Q_ASSERT(watcher->sections.size() == data.size());
     Q_ASSERT(watcher->roles.size() == data.size());
-    QVector<int> horizontalSections;
-    QVector<int> verticalSections;
+    QList<int> horizontalSections;
+    QList<int> verticalSections;
 
     for (int i = 0; i < data.size(); ++i) {
         if (watcher->orientations[i] == Qt::Horizontal)
@@ -735,8 +735,8 @@ void QAbstractItemModelReplicaImplementation::requestedHeaderData(QRemoteObjectP
         QHash<int, QVariant> &dat = m_headerData[index][watcher->sections[i]].data;
         dat[role] = data[i];
     }
-    QVector<QPair<int, int> > horRanges = listRanges(horizontalSections);
-    QVector<QPair<int, int> > verRanges = listRanges(verticalSections);
+    QList<QPair<int, int>> horRanges = listRanges(horizontalSections);
+    QList<QPair<int, int>> verRanges = listRanges(verticalSections);
 
     for (int i = 0; i < horRanges.size(); ++i)
         emit q->headerDataChanged(Qt::Horizontal, horRanges[i].first, horRanges[i].second);
@@ -746,7 +746,7 @@ void QAbstractItemModelReplicaImplementation::requestedHeaderData(QRemoteObjectP
     delete watcher;
 }
 
-QAbstractItemModelReplica::QAbstractItemModelReplica(QAbstractItemModelReplicaImplementation *rep, QtRemoteObjects::InitialAction action, const QVector<int> &rolesHint)
+QAbstractItemModelReplica::QAbstractItemModelReplica(QAbstractItemModelReplicaImplementation *rep, QtRemoteObjects::InitialAction action, const QList<int> &rolesHint)
     : QAbstractItemModel()
     , d(rep)
 {
@@ -801,8 +801,8 @@ bool QAbstractItemModelReplica::setData(const QModelIndex &index, const QVariant
     if (index.column() < 0 || index.column() >= columnCount(index.parent()))
         return false;
 
-    const QVector<int > &availRoles = availableRoles();
-    const QVector<int>::const_iterator res = std::find(availRoles.begin(), availRoles.end(), role);
+    const QList<int> &availRoles = availableRoles();
+    const auto res = std::find(availRoles.begin(), availRoles.end(), role);
     if (res == availRoles.end()) {
         qCWarning(QT_REMOTEOBJECT_MODELS) << "Tried to setData for index" << index << "on a not supported role" << role;
         return false;
@@ -844,7 +844,7 @@ QVariant QAbstractItemModelReplica::data(const QModelIndex & index, int role) co
     Q_ASSERT(toQModelIndex(start, this).isValid());
 
     RequestedData data;
-    QVector<int> roles;
+    QList<int> roles;
     roles << role;
     data.start = start;
     data.end = end;
@@ -927,7 +927,7 @@ int QAbstractItemModelReplica::columnCount(const QModelIndex &parent) const
 QVariant QAbstractItemModelReplica::headerData(int section, Qt::Orientation orientation, int role) const
 {
     const int index = orientation == Qt::Horizontal ? 0 : 1;
-    const QVector<CacheEntry> elem = d->m_headerData[index];
+    const QList<CacheEntry> elem = d->m_headerData[index];
     if (section >= elem.size())
         return QVariant();
 
@@ -980,7 +980,7 @@ void QAbstractItemModelReplica::setRootCacheSize(size_t rootCacheSize)
     d->m_rootItem.children.setCacheSize(rootCacheSize);
 }
 
-QVector<int> QAbstractItemModelReplica::availableRoles() const
+QList<int> QAbstractItemModelReplica::availableRoles() const
 {
     return d->availableRoles();
 }
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
index 24234d6..b45a7d4 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
@@ -66,7 +66,7 @@ public:
     int columnCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
-    QVector<int> availableRoles() const;
+    QList<int> availableRoles() const;
     QHash<int, QByteArray> roleNames() const override;
 
     bool isInitialized() const;
@@ -79,7 +79,7 @@ Q_SIGNALS:
     void initialized();
 
 private:
-    explicit QAbstractItemModelReplica(QAbstractItemModelReplicaImplementation *rep, QtRemoteObjects::InitialAction action, const QVector<int> &rolesHint);
+    explicit QAbstractItemModelReplica(QAbstractItemModelReplicaImplementation *rep, QtRemoteObjects::InitialAction action, const QList<int> &rolesHint);
     QScopedPointer<QAbstractItemModelReplicaImplementation> d;
     friend class QAbstractItemModelReplicaImplementation;
     friend class QRemoteObjectNode;
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h b/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h
index 8f13091..04362f4 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h
@@ -75,7 +75,7 @@ struct CacheEntry
     {}
 };
 
-typedef QVector<CacheEntry> CachedRowEntry;
+using CachedRowEntry = QList<CacheEntry>;
 
 template <class Key, class Value>
 struct LRUCache
@@ -274,7 +274,7 @@ struct RequestedData
 {
     IndexList start;
     IndexList end;
-    QVector<int> roles;
+    QList<int> roles;
 };
 
 struct RequestedHeaderData
@@ -298,26 +298,26 @@ class RowWatcher : public QRemoteObjectPendingCallWatcher
 {
     Q_OBJECT
 public:
-    RowWatcher(IndexList _start, IndexList _end, QVector<int> _roles, const QRemoteObjectPendingReply<DataEntries> &reply)
+    RowWatcher(IndexList _start, IndexList _end, QList<int> _roles, const QRemoteObjectPendingReply<DataEntries> &reply)
         : QRemoteObjectPendingCallWatcher(reply),
           start(_start),
           end(_end),
           roles(_roles) {}
     IndexList start, end;
-    QVector<int> roles;
+    QList<int> roles;
 };
 
 class HeaderWatcher : public QRemoteObjectPendingCallWatcher
 {
     Q_OBJECT
 public:
-    HeaderWatcher(QVector<Qt::Orientation> _orientations, QVector<int> _sections, QVector<int> _roles, const QRemoteObjectPendingReply<QVariantList> &reply)
+    HeaderWatcher(QList<Qt::Orientation> _orientations, QList<int> _sections, QList<int> _roles, const QRemoteObjectPendingReply<QVariantList> &reply)
         : QRemoteObjectPendingCallWatcher(reply),
           orientations(_orientations),
           sections(_sections),
           roles(_roles) {}
-    QVector<Qt::Orientation> orientations;
-    QVector<int> sections, roles;
+    QList<Qt::Orientation> orientations;
+    QList<int> sections, roles;
 };
 
 class QAbstractItemModelReplicaImplementation : public QRemoteObjectReplica
@@ -325,7 +325,7 @@ class QAbstractItemModelReplicaImplementation : public QRemoteObjectReplica
     Q_OBJECT
     //TODO Use an input name for the model on the Replica side
     Q_CLASSINFO(QCLASSINFO_REMOTEOBJECT_TYPE, "ServerModelAdapter")
-    Q_PROPERTY(QVector<int> availableRoles READ availableRoles NOTIFY availableRolesChanged)
+    Q_PROPERTY(QList<int> availableRoles READ availableRoles NOTIFY availableRolesChanged)
     Q_PROPERTY(QIntHash roleNames READ roleNames)
 public:
     QAbstractItemModelReplicaImplementation();
@@ -334,10 +334,10 @@ public:
     void initialize() override;
     static void registerMetatypes();
 
-    inline const QVector<int> &availableRoles() const
+    inline const QList<int> &availableRoles() const
     {
         if (m_availableRoles.isEmpty())
-            m_availableRoles = propAsVariant(0).value<QVector<int> >();
+            m_availableRoles = propAsVariant(0).value<QList<int>>();
         return m_availableRoles;
     }
 
@@ -348,11 +348,11 @@ public:
     }
 
     void setModel(QAbstractItemModelReplica *model);
-    bool clearCache(const IndexList &start, const IndexList &end, const QVector<int> &roles);
+    bool clearCache(const IndexList &start, const IndexList &end, const QList<int> &roles);
 
 Q_SIGNALS:
     void availableRolesChanged();
-    void dataChanged(IndexList topLeft, IndexList bottomRight, QVector<int> roles);
+    void dataChanged(IndexList topLeft, IndexList bottomRight, QList<int> roles);
     void rowsInserted(IndexList parent, int first, int last);
     void rowsRemoved(IndexList parent, int first, int last);
     void rowsMoved(IndexList parent, int start, int end, IndexList destination, int row);
@@ -369,16 +369,16 @@ public Q_SLOTS:
         __repc_args << QVariant::fromValue(parentList);
         return QRemoteObjectPendingReply<QSize>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
     }
-    QRemoteObjectPendingReply<DataEntries> replicaRowRequest(IndexList start, IndexList end, QVector<int> roles)
+    QRemoteObjectPendingReply<DataEntries> replicaRowRequest(IndexList start, IndexList end, QList<int> roles)
     {
-        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaRowRequest(IndexList,IndexList,QVector<int>)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaRowRequest(IndexList,IndexList,QList<int>)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(start) << QVariant::fromValue(end) << QVariant::fromValue(roles);
         return QRemoteObjectPendingReply<DataEntries>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
     }
-    QRemoteObjectPendingReply<QVariantList> replicaHeaderRequest(QVector<Qt::Orientation> orientations, QVector<int> sections, QVector<int> roles)
+    QRemoteObjectPendingReply<QVariantList> replicaHeaderRequest(QList<Qt::Orientation> orientations, QList<int> sections, QList<int> roles)
     {
-        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaHeaderRequest(QVector<Qt::Orientation>,QVector<int>,QVector<int>)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaHeaderRequest(QList<Qt::Orientation>,QList<int>,QList<int>)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(orientations) << QVariant::fromValue(sections) << QVariant::fromValue(roles);
         return QRemoteObjectPendingReply<QVariantList>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
@@ -397,15 +397,15 @@ public Q_SLOTS:
         __repc_args << QVariant::fromValue(index) << QVariant::fromValue(value) << QVariant::fromValue(role);
         send(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args);
     }
-    QRemoteObjectPendingReply<MetaAndDataEntries> replicaCacheRequest(size_t size, QVector<int> roles)
+    QRemoteObjectPendingReply<MetaAndDataEntries> replicaCacheRequest(size_t size, QList<int> roles)
     {
-        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaCacheRequest(size_t,QVector<int>)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaCacheRequest(size_t,QList<int>)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(size) << QVariant::fromValue(roles);
         return QRemoteObjectPendingReply<MetaAndDataEntries>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
     }
     void onHeaderDataChanged(Qt::Orientation orientation, int first, int last);
-    void onDataChanged(const IndexList &start, const IndexList &end, const QVector<int> &roles);
+    void onDataChanged(const IndexList &start, const IndexList &end, const QList<int> &roles);
     void onRowsInserted(const IndexList &parent, int start, int end);
     void onRowsRemoved(const IndexList &parent, int start, int end);
     void onColumnsInserted(const IndexList &parent, int start, int end);
@@ -421,11 +421,11 @@ public Q_SLOTS:
     void handleModelResetDone(QRemoteObjectPendingCallWatcher *watcher);
     void handleSizeDone(QRemoteObjectPendingCallWatcher *watcher);
     void onReplicaCurrentChanged(const QModelIndex &current, const QModelIndex &previous);
-    void fillCache(const IndexValuePair &pair,const QVector<int> &roles);
+    void fillCache(const IndexValuePair &pair,const QList<int> &roles);
 
 public:
     QScopedPointer<QItemSelectionModel> m_selectionModel;
-    QVector<CacheEntry> m_headerData[2];
+    QList<CacheEntry> m_headerData[2];
 
     CacheData m_rootItem;
     inline CacheData* cacheData(const QModelIndex &index) const {
@@ -461,14 +461,14 @@ public:
     void initializeModelConnections();
 
     bool m_initDone = false;
-    QVector<RequestedData> m_requestedData;
-    QVector<RequestedHeaderData> m_requestedHeaderData;
-    QVector<QRemoteObjectPendingCallWatcher*> m_pendingRequests;
+    QList<RequestedData> m_requestedData;
+    QList<RequestedHeaderData> m_requestedHeaderData;
+    QList<QRemoteObjectPendingCallWatcher*> m_pendingRequests;
     QAbstractItemModelReplica *q;
-    mutable QVector<int> m_availableRoles;
+    mutable QList<int> m_availableRoles;
     std::unordered_set<CacheData*> m_activeParents;
     QtRemoteObjects::InitialAction m_initialAction;
-    QVector<int> m_initialFetchRolesHint;
+    QList<int> m_initialFetchRolesHint;
 };
 
 QT_END_NAMESPACE
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeltypes.h b/src/remoteobjects/qremoteobjectabstractitemmodeltypes.h
index ae6149e..58ff790 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodeltypes.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodeltypes.h
@@ -40,16 +40,15 @@
 #ifndef QREMOTEOBJECTS_ABSTRACT_ITEM_MODEL_TYPES_H
 #define QREMOTEOBJECTS_ABSTRACT_ITEM_MODEL_TYPES_H
 
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qdatastream.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qitemselectionmodel.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qnamespace.h>
 #include <QtCore/qpair.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qabstractitemmodel.h>
-#include <QtCore/qitemselectionmodel.h>
 #include <QtCore/qsize.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qnamespace.h>
+#include <QtCore/qvariant.h>
 #include <QtRemoteObjects/qtremoteobjectglobal.h>
 
 QT_BEGIN_NAMESPACE
@@ -88,7 +87,7 @@ struct IndexValuePair
     QVariantList data;
     Qt::ItemFlags flags;
     bool hasChildren;
-    QVector<IndexValuePair> children;
+    QList<IndexValuePair> children;
     QSize size;
 };
 
@@ -97,12 +96,12 @@ struct DataEntries
     inline bool operator==(const DataEntries &other) const { return data == other.data; }
     inline bool operator!=(const DataEntries &other) const { return !(*this == other); }
 
-    QVector<IndexValuePair> data;
+    QList<IndexValuePair> data;
 };
 
 struct MetaAndDataEntries : DataEntries
 {
-    QVector<int> roles;
+    QList<int> roles;
     QSize size;
 };
 
diff --git a/src/remoteobjects/qremoteobjectdynamicreplica.cpp b/src/remoteobjects/qremoteobjectdynamicreplica.cpp
index 7f8fa5a..c2d7f24 100644
--- a/src/remoteobjects/qremoteobjectdynamicreplica.cpp
+++ b/src/remoteobjects/qremoteobjectdynamicreplica.cpp
@@ -178,7 +178,6 @@ int QRemoteObjectDynamicReplica::qt_metacall(QMetaObject::Call call, int id, voi
         } else {
             // method relay from Replica to Source
             const QMetaMethod mm = impl->m_metaObject->method(saved_id);
-
             const int nParam = mm.parameterCount();
             QVariantList args;
             args.reserve(nParam);
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index 0d8adf8..c49c938 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -59,13 +59,13 @@ QT_BEGIN_NAMESPACE
 using namespace QtRemoteObjects;
 using namespace QRemoteObjectStringLiterals;
 
-using GadgetType = QVector<QVariant>;
+using GadgetType = QList<QVariant>;
 
 struct ManagedGadgetTypeEntry
 {
     GadgetType gadgetType;
     QMetaType gadgetMetaType;
-    QVector<QMetaType> enumMetaTypes;
+    QList<QMetaType> enumMetaTypes;
     std::shared_ptr<QMetaObject> metaObject;
 
     void unregisterMetaTypes()
@@ -790,7 +790,7 @@ struct EnumData {
     QByteArray name;
     bool isFlag, isScoped;
     quint32 keyCount, size;
-    QVector<EnumPair> values;
+    QList<EnumPair> values;
 };
 
 struct GadgetProperty {
@@ -799,8 +799,8 @@ struct GadgetProperty {
 };
 
 struct GadgetData {
-    QVector<GadgetProperty> properties;
-    QVector<EnumData> enums;
+    QList<GadgetProperty> properties;
+    QList<EnumData> enums;
 };
 
 static const char *strDup(const QByteArray &s)
@@ -903,7 +903,7 @@ static int registerGadgets(IoDeviceBase *connection, Gadgets &gadgets, QByteArra
         dynamicProperty.setWritable(true);
         dynamicProperty.setReadable(true);
     }
-    QVector<TypeInfo *> enumsToBeAssignedMetaObject;
+    QList<TypeInfo *> enumsToBeAssignedMetaObject;
     enumsToBeAssignedMetaObject.reserve(gadget.enums.length());
     for (const auto &enumData: gadget.enums) {
         auto enumBuilder = gadgetBuilder.addEnumerator(enumData.name);
@@ -1057,7 +1057,7 @@ QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(IoDeviceBase *connec
     builder.setClassName(type);
 
     in >> numEnums;
-    QVector<quint32> enumSizes(numEnums);
+    QList<quint32> enumSizes(numEnums);
     enumsToBeAssignedMetaObject.reserve(numEnums);
     for (quint32 i = 0; i < numEnums; ++i) {
         EnumData enumData;
@@ -1087,7 +1087,7 @@ QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(IoDeviceBase *connec
     in >> numSignals;
     for (quint32 i = 0; i < numSignals; ++i) {
         QByteArray signature;
-        QList<QByteArray> paramNames;
+        QByteArrayList paramNames;
         in >> signature;
         in >> paramNames;
         ++curIndex;
@@ -1098,7 +1098,7 @@ QMetaObject *QRemoteObjectMetaObjectManager::addDynamicType(IoDeviceBase *connec
     in >> numMethods;
     for (quint32 i = 0; i < numMethods; ++i) {
         QByteArray signature, returnType;
-        QList<QByteArray> paramNames;
+        QByteArrayList paramNames;
         in >> signature;
         in >> returnType;
         in >> paramNames;
@@ -2452,13 +2452,13 @@ bool QRemoteObjectHostBase::enableRemoting(QObject *object, const QString &name)
 
     \sa disableRemoting()
  */
-bool QRemoteObjectHostBase::enableRemoting(QAbstractItemModel *model, const QString &name, const QVector<int> roles, QItemSelectionModel *selectionModel)
+bool QRemoteObjectHostBase::enableRemoting(QAbstractItemModel *model, const QString &name, const QList<int> roles, QItemSelectionModel *selectionModel)
 {
     //This looks complicated, but hopefully there is a way to have an adapter be a template
     //parameter and this makes sure that is supported.
     QObject *adapter = QAbstractItemModelSourceAdapter::staticMetaObject.newInstance(Q_ARG(QAbstractItemModel*, model),
                                                                                      Q_ARG(QItemSelectionModel*, selectionModel),
-                                                                                     Q_ARG(QVector<int>, roles));
+                                                                                     Q_ARG(QList<int>, roles));
     QAbstractItemAdapterSourceAPI<QAbstractItemModel, QAbstractItemModelSourceAdapter> *api =
         new QAbstractItemAdapterSourceAPI<QAbstractItemModel, QAbstractItemModelSourceAdapter>(name);
     if (!this->objectName().isEmpty())
@@ -2582,7 +2582,7 @@ void QRemoteObjectHostBase::addHostSideConnection(QIODevice *ioDevice)
  the Model on the network. The returned model will be empty until it is
  initialized with the \l Source.
  */
-QAbstractItemModelReplica *QRemoteObjectNode::acquireModel(const QString &name, QtRemoteObjects::InitialAction action, const QVector<int> &rolesHint)
+QAbstractItemModelReplica *QRemoteObjectNode::acquireModel(const QString &name, QtRemoteObjects::InitialAction action, const QList<int> &rolesHint)
 {
     QAbstractItemModelReplicaImplementation *rep = acquire<QAbstractItemModelReplicaImplementation>(name);
     return new QAbstractItemModelReplica(rep, action, rolesHint);
@@ -2703,7 +2703,7 @@ void ProxyInfo::proxyObject(const QRemoteObjectSourceLocation &entry, ProxyDirec
             QAbstractItemModelReplica *rep = proxyNode->acquireModel(name);
             proxiedReplicas.insert(name, new ProxyReplicaInfo{rep, direction});
             connect(rep, &QAbstractItemModelReplica::initialized, this,
-                    [rep, name, this]() { this->parentNode->enableRemoting(rep, name, QVector<int>()); });
+                    [rep, name, this]() { this->parentNode->enableRemoting(rep, name, QList<int>()); });
         } else {
             QRemoteObjectDynamicReplica *rep = proxyNode->acquireDynamic(name);
             proxiedReplicas.insert(name, new ProxyReplicaInfo{rep, direction});
@@ -2731,7 +2731,7 @@ void ProxyInfo::proxyObject(const QRemoteObjectSourceLocation &entry, ProxyDirec
             {
                 QRemoteObjectHostBase *host = qobject_cast<QRemoteObjectHostBase *>(this->proxyNode);
                 Q_ASSERT(host);
-                host->enableRemoting(rep, name, QVector<int>());
+                host->enableRemoting(rep, name, QList<int>());
             });
         } else {
             QRemoteObjectDynamicReplica *rep = this->parentNode->acquireDynamic(name);
diff --git a/src/remoteobjects/qremoteobjectnode.h b/src/remoteobjects/qremoteobjectnode.h
index 0fa6283..6a318aa 100644
--- a/src/remoteobjects/qremoteobjectnode.h
+++ b/src/remoteobjects/qremoteobjectnode.h
@@ -128,7 +128,7 @@ public:
     QStringList instances(const QString &typeName) const;
 
     QRemoteObjectDynamicReplica *acquireDynamic(const QString &name);
-    QAbstractItemModelReplica *acquireModel(const QString &name, QtRemoteObjects::InitialAction action = QtRemoteObjects::FetchRootSize, const QVector<int> &rolesHint = {});
+    QAbstractItemModelReplica *acquireModel(const QString &name, QtRemoteObjects::InitialAction action = QtRemoteObjects::FetchRootSize, const QList<int> &rolesHint = {});
     QUrl registryUrl() const;
     virtual bool setRegistryUrl(const QUrl &registryAddress);
     bool waitForRegistry(int timeout = 30000);
@@ -182,7 +182,7 @@ public:
         return enableRemoting(object, api);
     }
     Q_INVOKABLE bool enableRemoting(QObject *object, const QString &name = QString());
-    bool enableRemoting(QAbstractItemModel *model, const QString &name, const QVector<int> roles, QItemSelectionModel *selectionModel = nullptr);
+    bool enableRemoting(QAbstractItemModel *model, const QString &name, const QList<int> roles, QItemSelectionModel *selectionModel = nullptr);
     Q_INVOKABLE bool disableRemoting(QObject *remoteObject);
     void addHostSideConnection(QIODevice *ioDevice);
 
diff --git a/src/remoteobjects/qremoteobjectpacket_p.h b/src/remoteobjects/qremoteobjectpacket_p.h
index bc482ba..20d1ae5 100644
--- a/src/remoteobjects/qremoteobjectpacket_p.h
+++ b/src/remoteobjects/qremoteobjectpacket_p.h
@@ -99,7 +99,7 @@ inline QDataStream& operator>>(QDataStream &stream, ObjectInfo &info)
     return stream >> info.name >> info.typeName >> info.signature;
 }
 
-typedef QVector<ObjectInfo> ObjectInfoList;
+using ObjectInfoList = QList<ObjectInfo>;
 
 enum class ObjectType : quint8 { CLASS, MODEL, GADGET };
 Q_ENUM_NS(ObjectType)
diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp
index 1448fe0..50a7ea0 100644
--- a/src/remoteobjects/qremoteobjectreplica.cpp
+++ b/src/remoteobjects/qremoteobjectreplica.cpp
@@ -199,7 +199,7 @@ bool QConnectedReplicaImplementation::sendCommand()
     return true;
 }
 
-QVector<int> QConnectedReplicaImplementation::childIndices() const
+QList<int> QConnectedReplicaImplementation::childIndices() const
 {
     return m_childIndices;
 }
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index 061d21e..178ee60 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -57,10 +57,9 @@
 
 #include "qremoteobjectpacket_p.h"
 
-#include <QtCore/qpointer.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qdatastream.h>
 #include <QtCore/qcompilerdetection.h>
+#include <QtCore/qdatastream.h>
+#include <QtCore/qpointer.h>
 #include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
@@ -158,7 +157,7 @@ public:
     bool isShortCircuit() const final { return false; }
     bool isInitialized() const override;
     bool waitForSource(int timeout) override;
-    QVector<int> childIndices() const;
+    QList<int> childIndices() const;
     void initialize(QVariantList &values);
     void configurePrivate(QRemoteObjectReplica *) override;
     void requestRemoteObjectSource();
@@ -174,9 +173,9 @@ public:
 
     void setDynamicMetaObject(const QMetaObject *meta) override;
     void setDynamicProperties(const QVariantList&) override;
-    QVector<QRemoteObjectReplica *> m_parentsNeedingConnect;
+    QList<QRemoteObjectReplica *> m_parentsNeedingConnect;
     QVariantList m_propertyStorage;
-    QVector<int> m_childIndices;
+    QList<int> m_childIndices;
     QPointer<IoDeviceBase> connectionToSource;
 
     // pending call data
diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp
index ef60316..f52c1a8 100644
--- a/src/remoteobjects/qremoteobjectsource.cpp
+++ b/src/remoteobjects/qremoteobjectsource.cpp
@@ -100,7 +100,7 @@ QRemoteObjectSourceBase::QRemoteObjectSourceBase(QObject *obj, Private *d, const
 
     const int nChildren = api->m_models.count() + api->m_subclasses.count();
     if (nChildren > 0) {
-        QVector<int> roles;
+        QList<int> roles;
         const int numProperties = api->propertyCount();
         int modelIndex = 0, subclassIndex = 0;
         for (int i = 0; i < numProperties; ++i) {
@@ -514,7 +514,7 @@ DynamicApiMap::DynamicApiMap(QObject *object, const QMetaObject *metaObject, con
     m_objectSignature = QtPrivate::qtro_classinfo_signature(metaObject);
 }
 
-QList<QByteArray> DynamicApiMap::signalParameterNames(int index) const
+QByteArrayList DynamicApiMap::signalParameterNames(int index) const
 {
     const int objectIndex = m_signals.at(index);
     checkCache(objectIndex);
@@ -553,7 +553,7 @@ const QByteArray DynamicApiMap::typeName(int index) const
     return m_cachedMetamethod.typeName();
 }
 
-QList<QByteArray> DynamicApiMap::methodParameterNames(int index) const
+QByteArrayList DynamicApiMap::methodParameterNames(int index) const
 {
     const int objectIndex = m_methods.at(index);
     checkCache(objectIndex);
diff --git a/src/remoteobjects/qremoteobjectsource.h b/src/remoteobjects/qremoteobjectsource.h
index 097e599..2255516 100644
--- a/src/remoteobjects/qremoteobjectsource.h
+++ b/src/remoteobjects/qremoteobjectsource.h
@@ -257,13 +257,13 @@ public:
     virtual int signalParameterCount(int index) const = 0;
     virtual int signalParameterType(int sigIndex, int paramIndex) const = 0;
     virtual const QByteArray signalSignature(int index) const = 0;
-    virtual QList<QByteArray> signalParameterNames(int index) const = 0;
+    virtual QByteArrayList signalParameterNames(int index) const = 0;
     virtual int methodParameterCount(int index) const = 0;
     virtual int methodParameterType(int methodIndex, int paramIndex) const = 0;
     virtual const QByteArray methodSignature(int index) const = 0;
     virtual QMetaMethod::MethodType methodType(int index) const = 0;
     virtual const QByteArray typeName(int index) const = 0;
-    virtual QList<QByteArray> methodParameterNames(int index) const = 0;
+    virtual QByteArrayList methodParameterNames(int index) const = 0;
     virtual int propertyIndexFromSignal(int index) const = 0;
     virtual int propertyRawIndexFromSignal(int index) const = 0;
     virtual QByteArray objectSignature() const = 0;
@@ -271,8 +271,8 @@ public:
     virtual bool isAdapterSignal(int) const { return false; }
     virtual bool isAdapterMethod(int) const { return false; }
     virtual bool isAdapterProperty(int) const { return false; }
-    QVector<ModelInfo> m_models;
-    QVector<SourceApiMap *> m_subclasses;
+    QList<ModelInfo> m_models;
+    QList<SourceApiMap *> m_subclasses;
 };
 
 QT_END_NAMESPACE
diff --git a/src/remoteobjects/qremoteobjectsource_p.h b/src/remoteobjects/qremoteobjectsource_p.h
index d27d790..8167688 100644
--- a/src/remoteobjects/qremoteobjectsource_p.h
+++ b/src/remoteobjects/qremoteobjectsource_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <QtCore/qobject.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qmetaobject.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 #include "qremoteobjectsource.h"
 #include "qremoteobjectpacket_p.h"
@@ -86,7 +86,7 @@ public:
     struct Private {
         Private(QRemoteObjectSourceIo *io, QRemoteObjectRootSource *root) : m_sourceIo(io), isDynamic(false), root(root) {}
         QRemoteObjectSourceIo *m_sourceIo;
-        QVector<IoDeviceBase*> m_listeners;
+        QList<IoDeviceBase*> m_listeners;
         QRemoteObjectPackets::DataStreamPacket m_packet;
 
         // Types needed during recursively sending a root to a new listener
@@ -167,14 +167,14 @@ public:
     int signalParameterCount(int index) const override { return parameterCount(m_signals.at(index)); }
     int signalParameterType(int sigIndex, int paramIndex) const override { return parameterType(m_signals.at(sigIndex), paramIndex); }
     const QByteArray signalSignature(int index) const override { return signature(m_signals.at(index)); }
-    QList<QByteArray> signalParameterNames(int index) const override;
+    QByteArrayList signalParameterNames(int index) const override;
 
     int methodParameterCount(int index) const override { return parameterCount(m_methods.at(index)); }
     int methodParameterType(int methodIndex, int paramIndex) const override { return parameterType(m_methods.at(methodIndex), paramIndex); }
     const QByteArray methodSignature(int index) const override { return signature(m_methods.at(index)); }
     QMetaMethod::MethodType methodType(int index) const override;
     const QByteArray typeName(int index) const override;
-    QList<QByteArray> methodParameterNames(int index) const override;
+    QByteArrayList methodParameterNames(int index) const override;
 
     int propertyIndexFromSignal(int index) const override
     {
@@ -207,10 +207,10 @@ public:
     QString m_typeName;
     int m_enumCount;
     int m_enumOffset;
-    QVector<int> m_properties;
-    QVector<int> m_signals;
-    QVector<int> m_methods;
-    QVector<int> m_propertyAssociatedWithSignal;
+    QList<int> m_properties;
+    QList<int> m_signals;
+    QList<int> m_methods;
+    QList<int> m_propertyAssociatedWithSignal;
     const QMetaObject *m_metaObject;
     mutable QMetaMethod m_cachedMetamethod;
     mutable int m_cachedMetamethodIndex;
diff --git a/src/repparser/parser.g b/src/repparser/parser.g
index 8e1af88..975f9a0 100644
--- a/src/repparser/parser.g
+++ b/src/repparser/parser.g
@@ -69,7 +69,7 @@
 #include <rep_grammar_p.h>
 #include <qregexparser.h>
 #include <QStringList>
-#include <QVector>
+#include <QList>
 #include <QRegularExpression>
 
 QT_BEGIN_NAMESPACE
@@ -138,7 +138,7 @@ struct ASTFunction
 
     QString returnType;
     QString name;
-    QVector<ASTDeclaration> params;
+    QList<ASTDeclaration> params;
 };
 Q_DECLARE_TYPEINFO(ASTFunction, Q_MOVABLE_TYPE);
 
@@ -162,7 +162,7 @@ struct ASTEnum
     explicit ASTEnum(const QString &name = QString());
 
     QString name;
-    QVector<ASTEnumParam> params;
+    QList<ASTEnumParam> params;
     bool isSigned;
     int max;
 };
@@ -183,7 +183,7 @@ struct ASTModel
 {
     ASTModel(int index = -1) : propertyIndex(index) {}
 
-    QVector<ASTModelRole> roles;
+    QList<ASTModelRole> roles;
     int propertyIndex;
 };
 Q_DECLARE_TYPEINFO(ASTModel, Q_MOVABLE_TYPE);
@@ -197,13 +197,13 @@ struct ASTClass
     bool hasPointerObjects() const;
 
     QString name;
-    QVector<ASTProperty> properties;
-    QVector<ASTFunction> signalsList;
-    QVector<ASTFunction> slotsList;
-    QVector<ASTEnum> enums;
+    QList<ASTProperty> properties;
+    QList<ASTFunction> signalsList;
+    QList<ASTFunction> slotsList;
+    QList<ASTEnum> enums;
     bool hasPersisted;
-    QVector<ASTModel> modelMetadata;
-    QVector<int> subClassPropertyIndices;
+    QList<ASTModel> modelMetadata;
+    QList<int> subClassPropertyIndices;
 };
 Q_DECLARE_TYPEINFO(ASTClass, Q_MOVABLE_TYPE);
 
@@ -223,17 +223,17 @@ Q_DECLARE_TYPEINFO(PODAttribute, Q_MOVABLE_TYPE);
 struct POD
 {
     QString name;
-    QVector<PODAttribute> attributes;
+    QList<PODAttribute> attributes;
 };
 Q_DECLARE_TYPEINFO(POD, Q_MOVABLE_TYPE);
 
 // The AST representation of a .rep file
 struct AST
 {
-    QVector<ASTClass> classes;
-    QVector<POD> pods;
-    QVector<ASTEnum> enums;
-    QVector<QString> enumUses;
+    QList<ASTClass> classes;
+    QList<POD> pods;
+    QList<ASTEnum> enums;
+    QList<QString> enumUses;
     QStringList preprocessorDirectives;
 };
 Q_DECLARE_TYPEINFO(AST, Q_MOVABLE_TYPE);
diff --git a/src/repparser/qregexparser.h b/src/repparser/qregexparser.h
index 4f48bba..2ffbfbe 100644
--- a/src/repparser/qregexparser.h
+++ b/src/repparser/qregexparser.h
@@ -149,7 +149,7 @@ private:
     QMap<QString, QString> m_captured;
     int m_maxMatchLen;
     QString m_errorString;
-    QVector<QMap<int, QString> > m_names; //storage for match names
+    QList<QMap<int, QString>> m_names; //storage for match names
 };
 
 template <typename _Parser, typename _Table>
diff --git a/tests/auto/benchmarks/tst_benchmarkstest.cpp b/tests/auto/benchmarks/tst_benchmarkstest.cpp
index 851f392..4b55176 100644
--- a/tests/auto/benchmarks/tst_benchmarkstest.cpp
+++ b/tests/auto/benchmarks/tst_benchmarkstest.cpp
@@ -252,7 +252,7 @@ void BenchmarksTest::benchModelLinearAccess()
         QScopedPointer<QAbstractItemModelReplica> model(localClient.acquireModel(QStringLiteral("BenchmarkRemoteModel")));
         QEventLoop loop;
         QHash<int, QPair<QString, QString>> dataToWait;
-        connect(model.data(), &QAbstractItemModelReplica::dataChanged, [&model, &loop, &dataToWait](const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) {
+        connect(model.data(), &QAbstractItemModelReplica::dataChanged, [&model, &loop, &dataToWait](const QModelIndex &topLeft, const QModelIndex &bottomRight, const QList<int> &roles) {
             for (int row = topLeft.row(); row <= bottomRight.row(); ++row) {
                 // we're assuming that the view will try use the sent data,
                 // therefore we're not optimizing the code
@@ -325,7 +325,7 @@ void BenchmarksTest::benchModelRandomAccess()
         model->setRootCacheSize(5000); // we need to make room for all 5000 rows that we'll use
         QEventLoop loop;
         QHash<int, QPair<QString, QString>> dataToWait;
-        connect(model.data(), &QAbstractItemModelReplica::dataChanged, [&model, &loop, &dataToWait](const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) {
+        connect(model.data(), &QAbstractItemModelReplica::dataChanged, [&model, &loop, &dataToWait](const QModelIndex &topLeft, const QModelIndex &bottomRight, const QList<int> &roles) {
             for (int row = topLeft.row(); row <= bottomRight.row(); ++row) {
                 // we're assuming that the view will try use the sent data,
                 // therefore we're not optimizing the code
diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index d7d7cdd..3be8587 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -52,7 +52,7 @@
 #define SET_NODE_NAME(obj) (obj).setName(QLatin1String(#obj))
 
 //DUMMY impl for variant comparison
-bool operator<(const QVector<int> &lhs, const QVector<int> &rhs)
+bool operator<(const QList<int> &lhs, const QList<int> &rhs)
 {
     return lhs.size() < rhs.size();
 }
@@ -558,7 +558,7 @@ private slots:
         source1.setData1(5);
         source1.setData2(5.0);
         source1.setData3(QStringLiteral("tcp"));
-        source1.setData4(QVector<int>() << 1 << 2 << 3 << 4 << 5);
+        source1.setData4(QList<int> { 1, 2, 3, 4, 5 });
         registry->enableRemoting(&source1);
 
         setupHost(true);
@@ -566,7 +566,7 @@ private slots:
         source2.setData1(5);
         source2.setData2(5.0);
         source2.setData3(QStringLiteral("local"));
-        source2.setData4(QVector<int>() << 1 << 2 << 3 << 4 << 5);
+        source2.setData4(QList<int> { 1, 2, 3, 4, 5 });
         host->enableRemoting(&source2);
         QVERIFY(host->waitForRegistry(1000));
 
@@ -582,15 +582,16 @@ private slots:
         QTRY_VERIFY(localCentre->isInitialized());
         QTRY_VERIFY(tcpCentre->isInitialized());
 
+        const QList<int> expected = { 1, 2, 3, 4, 5 };
         QCOMPARE(tcpCentre->data1(), 5 );
         QCOMPARE(tcpCentre->data2(), 5.0);
         QCOMPARE(tcpCentre->data3(), QStringLiteral("tcp"));
-        QCOMPARE(tcpCentre->data4(), QVector<int>() << 1 << 2 << 3 << 4 << 5);
+        QCOMPARE(tcpCentre->data4(), expected);
 
         QCOMPARE(localCentre->data1(), 5);
         QCOMPARE(localCentre->data2(), 5.0);
         QCOMPARE(localCentre->data3(), QStringLiteral("local"));
-        QCOMPARE(localCentre->data4(), QVector<int>() << 1 << 2 << 3 << 4 << 5);
+        QCOMPARE(localCentre->data4(), expected);
     }
 
     void invalidUrlsTest()
diff --git a/tests/auto/modelreplica/tst_modelreplicatest.cpp b/tests/auto/modelreplica/tst_modelreplicatest.cpp
index 1ceb996..2d158ea 100644
--- a/tests/auto/modelreplica/tst_modelreplicatest.cpp
+++ b/tests/auto/modelreplica/tst_modelreplicatest.cpp
@@ -76,7 +76,7 @@ void ModelreplicaTest::basicFunctions()
     QVERIFY(replica->waitForSource(300));
     QVERIFY(tracksSpy.wait());
     // Rep file only uses display role
-    QCOMPARE(QVector<int>{Qt::DisplayRole}, replica->tracks()->availableRoles());
+    QCOMPARE(QList<int>{Qt::DisplayRole}, replica->tracks()->availableRoles());
 
     QCOMPARE(model->rowCount(), replica->tracks()->rowCount());
     for (int i = 0; i < replica->tracks()->rowCount(); i++)
diff --git a/tests/auto/modelview/tst_modelview.cpp b/tests/auto/modelview/tst_modelview.cpp
index 02bebce..b87b768 100644
--- a/tests/auto/modelview/tst_modelview.cpp
+++ b/tests/auto/modelview/tst_modelview.cpp
@@ -42,14 +42,14 @@
 namespace {
 
 template <class Storage>
-bool waitForSignal(QVector<Storage> *storage, QSignalSpy *spy)
+bool waitForSignal(QList<Storage> *storage, QSignalSpy *spy)
 {
     if (!storage || !spy)
         return false;
     const int maxRuns = 10;
     int runs = 0;
     const int storageSize = storage->size();
-    QVector<Storage> rowsToRemove;
+    QList<Storage> rowsToRemove;
     while (runs < maxRuns) {
         ++runs;
         if (spy->wait() && !spy->isEmpty()){
@@ -185,7 +185,7 @@ void compareData(const QAbstractItemModel *sourceModel, const QAbstractItemModel
 }
 
 void compareIndex(const QModelIndex &sourceIndex, const QModelIndex &replicaIndex,
-                  const QVector<int> &roles)
+                  const QList<int> &roles)
 {
     QVERIFY(sourceIndex.isValid());
     QVERIFY(replicaIndex.isValid());
@@ -231,7 +231,7 @@ void compareTreeData(const QAbstractItemModel *sourceModel, const QAbstractItemM
     }
 }
 
-void compareTreeData(const QAbstractItemModel *sourceModel, const QAbstractItemModel *replica, const QVector<int> &roles)
+void compareTreeData(const QAbstractItemModel *sourceModel, const QAbstractItemModel *replica, const QList<int> &roles)
 {
     QVERIFY(sourceModel);
     QVERIFY(replica);
@@ -294,7 +294,7 @@ public:
         m_list.clear();
     }
 private:
-    QVector<QPair<QVariant, QVariant> > m_list;
+    QList<QPair<QVariant, QVariant>> m_list;
 };
 
 QList<QStandardItem*> addChild(int numChilds, int nestingLevel)
@@ -338,14 +338,14 @@ public:
         connect(m_replica, &QAbstractItemModelReplica::rowsInserted, this, &FetchData::rowsInserted);
     }
 
-    void addData(const QModelIndex &index, const QVector<int> &roles)
+    void addData(const QModelIndex &index, const QList<int> &roles)
     {
         for (int role : roles) {
             const bool cached = m_replica->hasData(index, role);
             if (cached)
                 continue;
             if (!m_pending.contains(index))
-                m_pending[index] = QVector<int>() << role;
+                m_pending[index] = QList<int>() << role;
             else {
                 if (!m_pending[index].contains(role))
                     m_pending[index].append(role);
@@ -353,7 +353,7 @@ public:
         }
     }
 
-    void addIndex(const QModelIndex &parent, const QVector<int> &roles)
+    void addIndex(const QModelIndex &parent, const QList<int> &roles)
     {
         if (parent.isValid())
             addData(parent, roles);
@@ -378,9 +378,9 @@ public:
             emitFetched();
             return;
         }
-        QHash<QPersistentModelIndex, QVector<int> > pending(m_pending);
+        QHash<QPersistentModelIndex, QList<int>> pending(m_pending);
         pending.detach();
-        QHash<QPersistentModelIndex, QVector<int> >::ConstIterator it(pending.constBegin()), end(pending.constEnd());
+        auto it(pending.constBegin()), end(pending.constEnd());
         for (; it != end; ++it) {
             for (int role : it.value()) {
                 QVariant v = m_replica->data(it.key(), role);
@@ -404,7 +404,7 @@ signals:
 
 private:
     const QAbstractItemModelReplica *m_replica;
-    QHash<QPersistentModelIndex, QVector<int> > m_pending;
+    QHash<QPersistentModelIndex, QList<int>> m_pending;
     QSet<QPersistentModelIndex> m_waitForInsertion;
     bool isFinished;
 
@@ -415,7 +415,7 @@ private:
 
     void rowsInserted(const QModelIndex &parent, int first, int last)
     {
-        static QVector<int> rolesV;
+        static QList<int> rolesV;
         if (rolesV.isEmpty())
             rolesV << Qt::DisplayRole << Qt::BackgroundRole;
         m_waitForInsertion.remove(parent);
@@ -440,7 +440,7 @@ private:
             fetch();
     }
 
-    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>())
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QList<int> &roles = {})
     {
         Q_ASSERT(topLeft.isValid());
         Q_ASSERT(bottomRight.isValid());
@@ -451,12 +451,12 @@ private:
             for (int j = topLeft.column(); j <= bottomRight.column(); ++j) {
                 const QModelIndex index = m_replica->index(i, j, parent);
                 Q_ASSERT(index.isValid());
-                QHash<QPersistentModelIndex, QVector<int> >::Iterator it = m_pending.find(index);
+                auto it = m_pending.find(index);
                 if (it == m_pending.end())
                     continue;
 
 #if 0
-                QVector<int> itroles = it.value();
+                QList<int> itroles = it.value();
                 itroles.detach();
                 if (roles.isEmpty()) {
                     itroles.clear();
@@ -595,9 +595,9 @@ void TestModelView::setup_models(QRemoteObjectHost &basicServer, QRemoteObjectNo
     static const QString url = QStringLiteral("tcp://127.0.0.1:%1");
 
     // QStandardItem::flags are stored as data with Qt::UserRole - 1
-    static const QVector<int> sourceModelRoles( {Qt::DisplayRole, Qt::BackgroundRole, (Qt::UserRole - 1)} );
+    static const QList<int> sourceModelRoles( {Qt::DisplayRole, Qt::BackgroundRole, (Qt::UserRole - 1)} );
 
-    static const QVector<int> listModelRoles( {Qt::UserRole, Qt::UserRole+1} );
+    static const QList<int> listModelRoles( {Qt::UserRole, Qt::UserRole+1} );
 
     //Setup registry
     //Registry needs to be created first until we get the retry mechanism implemented
@@ -613,7 +613,7 @@ void TestModelView::setup_models(QRemoteObjectHost &basicServer, QRemoteObjectNo
 void TestModelView::testEmptyModel()
 {
     _SETUP_TEST_
-    QVector<int> roles = QVector<int>() << Qt::DisplayRole << Qt::BackgroundRole;
+    QList<int> roles = QList<int>() << Qt::DisplayRole << Qt::BackgroundRole;
     QStandardItemModel emptyModel;
     basicServer.enableRemoting(&emptyModel, "emptyModel", roles);
 
@@ -684,7 +684,7 @@ void TestModelView::testDataChangedTree()
     QVERIFY(f.fetchAndWait());
 
     compareTreeData(&m_sourceModel, model.data());
-    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
     QSet<int> expected;
     for (int i = 10; i < 20; ++i) {
         const QModelIndex parent = m_sourceModel.index(i,0);
@@ -731,7 +731,7 @@ void TestModelView::testFlags()
     f.addAll();
     QVERIFY(f.fetchAndWait());
 
-    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
     for (int i = 10; i < 20; ++i) {
         QStandardItem* firstItem = m_sourceModel.item(i, 0);
         QStandardItem* secondItem = m_sourceModel.item(i, 1);
@@ -757,7 +757,7 @@ void TestModelView::testDataChanged()
     f.addAll();
     QVERIFY(f.fetchAndWait());
 
-    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
     for (int i = 10; i < 20; ++i)
         m_sourceModel.setData(m_sourceModel.index(i, 1), QColor(Qt::blue), Qt::BackgroundRole);
 
@@ -780,16 +780,16 @@ void TestModelView::testDataInsertion()
     f.addAll();
     QVERIFY(f.fetchAndWait());
 
-    QVector<QModelIndex> pending;
+    QList<QModelIndex> pending;
 
-    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-    QVector<InsertedRow> insertedRows;
+    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+    QList<InsertedRow> insertedRows;
     QSignalSpy rowSpy(model.data(), SIGNAL(rowsInserted(QModelIndex,int,int)));
     m_sourceModel.insertRows(2, 9);
     insertedRows.append(InsertedRow(QModelIndex(), 2, 10));
     const int maxRuns = 10;
     int runs = 0;
-    QVector<InsertedRow> rowsToRemove;
+    QList<InsertedRow> rowsToRemove;
     while (runs < maxRuns) {
         ++runs;
         if (rowSpy.wait() && !rowSpy.isEmpty()){
@@ -844,13 +844,13 @@ void TestModelView::testDataInsertionTree()
     f.addAll();
     QVERIFY(f.fetchAndWait());
 
-    const QVector<int> roles = model->availableRoles();
+    const QList<int> roles = model->availableRoles();
 
-    QVector<InsertedRow> insertedRows;
+    QList<InsertedRow> insertedRows;
     QSignalSpy rowSpy(model.data(), SIGNAL(rowsInserted(QModelIndex,int,int)));
 
-    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-    QVector<QModelIndex> pending;
+    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+    QList<QModelIndex> pending;
 
     for (int i = 0; i < 9; ++ i) {
         insertedRows.append(InsertedRow(QModelIndex(), 2 + i, 2 + i));
@@ -876,7 +876,7 @@ void TestModelView::testDataInsertionTree()
 
     const int maxRuns = 10;
     int runs = 0;
-    QVector<InsertedRow> rowsToRemove;
+    QList<InsertedRow> rowsToRemove;
     while (runs < maxRuns) {
         ++runs;
         if (rowSpy.wait() && !rowSpy.isEmpty()){
@@ -933,7 +933,7 @@ void TestModelView::testDataRemoval()
     f.addAll();
     QVERIFY(f.fetchAndWait());
 
-    QVector<InsertedRow> removedRows;
+    QList<InsertedRow> removedRows;
     QSignalSpy rowSpy(model.data(), SIGNAL(rowsRemoved(QModelIndex,int,int)));
 
 
@@ -952,8 +952,8 @@ void TestModelView::testDataRemoval()
 
     // change one row to check for inconsistencies
 
-    QVector<QModelIndex> pending;
-    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
+    QList<QModelIndex> pending;
+    QSignalSpy dataChangedSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
     pending << m_sourceModel.index(0, 0, parent);
     WaitForDataChanged w(pending, &dataChangedSpy);
     m_sourceModel.setData(m_sourceModel.index(0, 0, parent), QColor(Qt::green), Qt::BackgroundRole);
@@ -991,7 +991,7 @@ void TestModelView::testDataRemovalTree()
 void TestModelView::testServerInsertDataTree()
 {
     _SETUP_TEST_
-    QVector<int> roles = QVector<int>() << Qt::DisplayRole << Qt::BackgroundRole;
+    QList<int> roles = QList<int> { Qt::DisplayRole, Qt::BackgroundRole };
     QStandardItemModel testTreeModel;
     basicServer.enableRemoting(&testTreeModel, "testTreeModel", roles);
 
@@ -1067,10 +1067,10 @@ void TestModelView::testSetData()
     compareTreeData(&m_sourceModel, model.data(), model->availableRoles());
 
     //fetched and verified initial state, now setData on the client
-    QSignalSpy dataChangedSpy(&m_sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-    QSignalSpy dataChangedReplicaSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-    QVector<QModelIndex> pending;
-    QVector<QModelIndex> pendingReplica;
+    QSignalSpy dataChangedSpy(&m_sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+    QSignalSpy dataChangedReplicaSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+    QList<QModelIndex> pending;
+    QList<QModelIndex> pendingReplica;
     for (int row = 0, numRows = model->rowCount(); row < numRows; ++row) {
         for (int column = 0, numColumns = model->columnCount(); column != numColumns; ++column) {
             const QModelIndex index = model->index(row, column);
@@ -1098,14 +1098,14 @@ void TestModelView::testSetDataTree()
     compareTreeData(&m_sourceModel, model.data(), model->availableRoles());
 
     //fetched and verified initial state, now setData on the client
-    QSignalSpy dataChangedSpy(&m_sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-    QSignalSpy dataChangedReplicaSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-    QVector<QModelIndex> pending;
-    QVector<QModelIndex> pendingReplica;
+    QSignalSpy dataChangedSpy(&m_sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+    QSignalSpy dataChangedReplicaSpy(model.data(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+    QList<QModelIndex> pending;
+    QList<QModelIndex> pendingReplica;
 
-    QVector<QModelIndex> stack;
+    QList<QModelIndex> stack;
     stack.push_back(QModelIndex());
-    QVector<QModelIndex> sourceStack;
+    QList<QModelIndex> sourceStack;
     sourceStack.push_back(QModelIndex());
 
 
@@ -1137,7 +1137,7 @@ void TestModelView::testSetDataTree()
 void TestModelView::testSelectionFromReplica()
 {
     _SETUP_TEST_
-    QVector<int> roles = QVector<int>() << Qt::DisplayRole << Qt::BackgroundRole;
+    QList<int> roles = QList<int> { Qt::DisplayRole, Qt::BackgroundRole };
     QStandardItemModel simpleModel;
     for (int i = 0; i < 4; ++i)
         simpleModel.appendRow(new QStandardItem(QString("item %0").arg(i)));
@@ -1158,7 +1158,7 @@ void TestModelView::testSelectionFromReplica()
 void TestModelView::testSelectionFromSource()
 {
     _SETUP_TEST_
-    QVector<int> roles = QVector<int>() << Qt::DisplayRole << Qt::BackgroundRole;
+    QList<int> roles = QList<int> { Qt::DisplayRole, Qt::BackgroundRole };
     QStandardItemModel simpleModel;
     for (int i = 0; i < 4; ++i)
         simpleModel.appendRow(new QStandardItem(QString("item %0").arg(i)));
@@ -1179,7 +1179,7 @@ void TestModelView::testSelectionFromSource()
 void TestModelView::testCacheData()
 {
     _SETUP_TEST_
-    QVector<int> roles = QVector<int>() << Qt::UserRole << Qt::UserRole + 1;
+    QList<int> roles = QList<int> { Qt::UserRole, Qt::UserRole + 1 };
     QScopedPointer<QAbstractItemModelReplica> model(client.acquireModel("testRoleNames", QtRemoteObjects::PrefetchData, roles));
     model->setRootCacheSize(1000);
 
@@ -1193,7 +1193,7 @@ void TestModelView::testCacheData()
 void TestModelView::testChildSelection()
 {
     _SETUP_TEST_
-    QVector<int> roles = {Qt::DisplayRole, Qt::BackgroundRole};
+    QList<int> roles = { Qt::DisplayRole, Qt::BackgroundRole };
     QStandardItemModel simpleModel;
     QStandardItem *parentItem = simpleModel.invisibleRootItem();
     for (int i = 0; i < 4; ++i) {
diff --git a/tests/auto/proxy/tst_proxy.cpp b/tests/auto/proxy/tst_proxy.cpp
index 7fc8024..03e9e47 100644
--- a/tests/auto/proxy/tst_proxy.cpp
+++ b/tests/auto/proxy/tst_proxy.cpp
@@ -224,7 +224,7 @@ void ProxyTest::testProxy()
         QVERIFY(tracksSpy.count() || tracksSpy.wait());
         // Rep file only uses display role, but proxy doesn't forward that yet
         if (!useProxy)
-            QCOMPARE(rep->tracks()->availableRoles(), QVector<int>{Qt::DisplayRole});
+            QCOMPARE(rep->tracks()->availableRoles(), QList<int> { Qt::DisplayRole });
         else {
             const auto &availableRolesVec = rep->tracks()->availableRoles();
             QSet<int> availableRoles;
@@ -236,8 +236,8 @@ void ProxyTest::testProxy()
                 roles.insert(it.key());
             QCOMPARE(availableRoles, roles);
         }
-        QSignalSpy dataSpy(rep->tracks(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-        QVector<QModelIndex> pending;
+        QSignalSpy dataSpy(rep->tracks(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+        QList<QModelIndex> pending;
         QTRY_COMPARE(rep->tracks()->rowCount(), model.rowCount());
         for (int i = 0; i < rep->tracks()->rowCount(); i++)
         {
@@ -299,7 +299,7 @@ void ProxyTest::testProxy()
         // Verify tracks data
         // Rep file only uses display role, but proxy doesn't forward that yet
         if (!useProxy)
-            QCOMPARE(tracksReplica->availableRoles(), QVector<int>{Qt::DisplayRole});
+            QCOMPARE(tracksReplica->availableRoles(), QList<int> { Qt::DisplayRole });
         else {
             const auto &availableRolesVec = tracksReplica->availableRoles();
             QSet<int> availableRoles;
@@ -312,8 +312,8 @@ void ProxyTest::testProxy()
             QCOMPARE(availableRoles, roles);
         }
         QTRY_COMPARE(tracksReplica->isInitialized(), true);
-        QSignalSpy dataSpy(tracksReplica, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
-        QVector<QModelIndex> pending;
+        QSignalSpy dataSpy(tracksReplica, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)));
+        QList<QModelIndex> pending;
         QTRY_COMPARE(tracksReplica->rowCount(), model.rowCount());
         for (int i = 0; i < tracksReplica->rowCount(); i++)
         {
@@ -436,7 +436,7 @@ void ProxyTest::testTopLevelModel()
 
     QStringListModel model;
     model.setStringList(QStringList() << "Track1" << "Track2" << "Track3");
-    host.enableRemoting(&model, "trackList", QVector<int>() << Qt::DisplayRole);
+    host.enableRemoting(&model, "trackList", QList<int> { Qt::DisplayRole });
 
     QRemoteObjectHost proxyNode;
     SET_NODE_NAME(proxyNode);
diff --git a/tests/auto/repfiles/localdatacenter.rep b/tests/auto/repfiles/localdatacenter.rep
index 1cbd324..0ea7c68 100644
--- a/tests/auto/repfiles/localdatacenter.rep
+++ b/tests/auto/repfiles/localdatacenter.rep
@@ -3,6 +3,6 @@ class LocalDataCenter
     PROP(int data1);
     PROP(float data2);
     PROP(QString data3);
-    PROP(QVector<int> data4);
-    SIGNAL(callMe(QVector<int> fun));
+    PROP(QList<int> data4);
+    SIGNAL(callMe(QList<int> fun));
 };
diff --git a/tests/auto/repfiles/tcpdatacenter.rep b/tests/auto/repfiles/tcpdatacenter.rep
index 210b058..9e3b207 100644
--- a/tests/auto/repfiles/tcpdatacenter.rep
+++ b/tests/auto/repfiles/tcpdatacenter.rep
@@ -3,5 +3,5 @@ class TcpDataCenter
     PROP(int data1);
     PROP(float data2);
     PROP(QString data3);
-    PROP(QVector<int> data4);
+    PROP(QList<int> data4);
 };
diff --git a/tests/auto/repparser/tst_parser.cpp b/tests/auto/repparser/tst_parser.cpp
index 506b35a..cee9233 100644
--- a/tests/auto/repparser/tst_parser.cpp
+++ b/tests/auto/repparser/tst_parser.cpp
@@ -123,8 +123,8 @@ void tst_Parser::testProperties_data()
     QTest::newRow("defaultWithValueWhitespaces") << "PROP(  int foo  = 1 )" << "int" << "foo" << "1" << ASTProperty::ReadPush << false;
     QTest::newRow("readonlyWithValueWhitespaces") << "PROP(  int foo = 1 READONLY  )" << "int" << "foo" << "1" << ASTProperty::ReadOnly << false;
     QTest::newRow("constantWithValueWhitespaces") << "PROP(  int foo = 1 CONSTANT )" << "int" << "foo" << "1" << ASTProperty::Constant << false;
-    QTest::newRow("templatetype") << "PROP(QVector<int> bar)" << "QVector<int>" << "bar" << QString() << ASTProperty::ReadPush << false;
-    QTest::newRow("nested templatetype") << "PROP(QMap<int, QVector<int> > bar)" << "QMap<int, QVector<int> >" << "bar" << QString() << ASTProperty::ReadPush << false;
+    QTest::newRow("templatetype") << "PROP(QList<int> bar)" << "QList<int>" << "bar" << QString() << ASTProperty::ReadPush << false;
+    QTest::newRow("nested templatetype") << "PROP(QMap<int, QList<int>> bar)" << "QMap<int, QList<int>>" << "bar" << QString() << ASTProperty::ReadPush << false;
     QTest::newRow("non-int default value") << "PROP(double foo=1.1 CONSTANT)" << "double" << "foo" << "1.1" << ASTProperty::Constant << false;
     QTest::newRow("tab") << "PROP(double\tfoo)" << "double" << "foo" << "" << ASTProperty::ReadPush << false;
     QTest::newRow("two tabs") << "PROP(double\t\tfoo)" << "double" << "foo" << "" << ASTProperty::ReadPush << false;
@@ -166,7 +166,7 @@ void tst_Parser::testProperties()
     QCOMPARE(ast.classes.count(), 1);
 
     const ASTClass astClass = ast.classes.first();
-    const QVector<ASTProperty> properties = astClass.properties;
+    const QList<ASTProperty> properties = astClass.properties;
     QCOMPARE(properties.count(), 1);
 
     const ASTProperty property = properties.first();
@@ -221,7 +221,7 @@ void tst_Parser::testSlots()
     QCOMPARE(ast.classes.count(), 1);
 
     const ASTClass astClass = ast.classes.first();
-    const QVector<ASTFunction> slotsList = astClass.slotsList;
+    const QList<ASTFunction> slotsList = astClass.slotsList;
     QCOMPARE(slotsList.count(), 1);
     ASTFunction slot = slotsList.first();
     QCOMPARE(QString("%1 %2(%3)").arg(slot.returnType).arg(slot.name).arg(slot.paramsAsString()), expectedSlot);
@@ -261,7 +261,7 @@ void tst_Parser::testSignals()
     QCOMPARE(ast.classes.count(), 1);
 
     const ASTClass astClass = ast.classes.first();
-    const QVector<ASTFunction> signalsList = astClass.signalsList;
+    const QList<ASTFunction> signalsList = astClass.signalsList;
     ASTFunction signal = signalsList.first();
     QCOMPARE(QString("%1(%2)").arg(signal.name).arg(signal.paramsAsString()), expectedSignal);
 }
@@ -308,7 +308,7 @@ void tst_Parser::testPods()
 
     QCOMPARE(ast.pods.count(), 1);
     const POD pods = ast.pods.first();
-    const QVector<PODAttribute> podsList = pods.attributes;
+    const QList<PODAttribute> podsList = pods.attributes;
     const QStringList typeList = expectedtypes.split(QLatin1Char(';'));
     const QStringList variableList = expectedvariables.split(QLatin1Char(';'));
     QVERIFY(typeList.count() == variableList.count());
@@ -380,7 +380,7 @@ void tst_Parser::testEnums()
         QCOMPARE(ast.enums.count(), 1);
         enums = ast.enums.first();
     }
-    const QVector<ASTEnumParam> paramList = enums.params;
+    const QList<ASTEnumParam> paramList = enums.params;
     const QStringList nameList = expectednames.split(QLatin1Char(';'));
     QVERIFY(nameList.count() == expectedvalues.count());
     QVERIFY(paramList.count() == expectedvalues.count());
@@ -396,16 +396,16 @@ void tst_Parser::testModels_data()
 {
     QTest::addColumn<QString>("modelDeclaration");
     QTest::addColumn<QString>("expectedModel");
-    QTest::addColumn<QVector<ASTModelRole>>("expectedRoles");
-    QTest::newRow("basicmodel") << "MODEL test(display)" << "test" << QVector<ASTModelRole>({{"display"}});
-    QTest::newRow("basicmodelsemicolon") << "MODEL test(display);" << "test" << QVector<ASTModelRole>({{"display"}});
+    QTest::addColumn<QList<ASTModelRole>>("expectedRoles");
+    QTest::newRow("basicmodel") << "MODEL test(display)" << "test" << QList<ASTModelRole>({{"display"}});
+    QTest::newRow("basicmodelsemicolon") << "MODEL test(display);" << "test" << QList<ASTModelRole>({{"display"}});
 }
 
 void tst_Parser::testModels()
 {
     QFETCH(QString, modelDeclaration);
     QFETCH(QString, expectedModel);
-    QFETCH(QVector<ASTModelRole>, expectedRoles);
+    QFETCH(QList<ASTModelRole>, expectedRoles);
 
     QTemporaryFile file;
     file.open();
diff --git a/tests/auto/shared/model_utilities.h b/tests/auto/shared/model_utilities.h
index d17f831..aea800b 100644
--- a/tests/auto/shared/model_utilities.h
+++ b/tests/auto/shared/model_utilities.h
@@ -52,7 +52,7 @@ struct WaitForDataChanged
         QModelIndex bottomRight;
     };
 
-    WaitForDataChanged(const QVector<QModelIndex> &pending, QSignalSpy *spy) : m_pending(pending), m_spy(spy){}
+    WaitForDataChanged(const QList<QModelIndex> &pending, QSignalSpy *spy) : m_pending(pending), m_spy(spy){}
     bool wait()
     {
         Q_ASSERT(m_spy);
@@ -82,7 +82,7 @@ struct WaitForDataChanged
         if (signal.size() != 3)
             return pair;
         const static QMetaType indexType = QMetaType::fromType<QModelIndex>();
-        const static QMetaType vectorType = QMetaType::fromType<QVector<int>>();
+        const static QMetaType vectorType = QMetaType::fromType<QList<int>>();
         const bool matchingTypes = signal[0].metaType() == indexType
                                    && signal[1].metaType() == indexType
                                    && signal[2].metaType() == vectorType;
@@ -113,7 +113,7 @@ struct WaitForDataChanged
                         m_pending.end());
     }
 
-    QVector<QModelIndex> m_pending;
+    QList<QModelIndex> m_pending;
     QSignalSpy *m_spy;
 };
 
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index ea2d42c..39f451b 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -86,8 +86,8 @@ static QString fullyQualifiedTypeName(const ASTClass& classContext, const QStrin
 }
 
 // for enums we need to transform signal/slot arguments to include the class scope
-static QVector<ASTFunction> transformEnumParams(const ASTClass& classContext, const QVector<ASTFunction> &methodList, const QString &typeName) {
-    QVector<ASTFunction> localList = methodList;
+static QList<ASTFunction> transformEnumParams(const ASTClass& classContext, const QList<ASTFunction> &methodList, const QString &typeName) {
+    QList<ASTFunction> localList = methodList;
     for (ASTFunction &astFunction : localList) {
         for (ASTDeclaration &astParam : astFunction.params) {
             for (const ASTEnum &astEnum : classContext.enums) {
@@ -137,7 +137,7 @@ static QByteArray typeData(const QString &type, const QHash<QString, QByteArray>
     return type.toLatin1();
 }
 
-static QByteArray functionsData(const QVector<ASTFunction> &functions, const QHash<QString, QByteArray> &specialTypes)
+static QByteArray functionsData(const QList<ASTFunction> &functions, const QHash<QString, QByteArray> &specialTypes)
 {
     QByteArray ret;
     for (const ASTFunction &func : functions) {
@@ -464,7 +464,7 @@ QString getEnumType(const ASTEnum &en)
     }
 }
 
-void RepCodeGenerator::generateDeclarationsForEnums(QTextStream &out, const QVector<ASTEnum> &enums, bool generateQENUM)
+void RepCodeGenerator::generateDeclarationsForEnums(QTextStream &out, const QList<ASTEnum> &enums, bool generateQENUM)
 {
     if (!generateQENUM) {
         out << "    // You need to add this enum as well as Q_ENUM to your" << Qt::endl;
@@ -484,7 +484,7 @@ void RepCodeGenerator::generateDeclarationsForEnums(QTextStream &out, const QVec
     }
 }
 
-void RepCodeGenerator::generateENUMs(QTextStream &out, const QVector<ASTEnum> &enums, const QString &className)
+void RepCodeGenerator::generateENUMs(QTextStream &out, const QList<ASTEnum> &enums, const QString &className)
 {
     out << "class " << className << "\n"
            "{\n"
@@ -501,7 +501,7 @@ void RepCodeGenerator::generateENUMs(QTextStream &out, const QVector<ASTEnum> &e
     generateStreamOperatorsForEnums(out, enums, className);
 }
 
-void RepCodeGenerator::generateConversionFunctionsForEnums(QTextStream &out, const QVector<ASTEnum> &enums)
+void RepCodeGenerator::generateConversionFunctionsForEnums(QTextStream &out, const QList<ASTEnum> &enums)
 {
     for (const ASTEnum &en : enums)
     {
@@ -522,7 +522,7 @@ void RepCodeGenerator::generateConversionFunctionsForEnums(QTextStream &out, con
     }
 }
 
-void RepCodeGenerator::generateStreamOperatorsForEnums(QTextStream &out, const QVector<ASTEnum> &enums, const QString &className)
+void RepCodeGenerator::generateStreamOperatorsForEnums(QTextStream &out, const QList<ASTEnum> &enums, const QString &className)
 {
     for (const ASTEnum &en : enums)
     {
@@ -547,7 +547,7 @@ void RepCodeGenerator::generateStreamOperatorsForEnums(QTextStream &out, const Q
 
 void RepCodeGenerator::generateENUM(QTextStream &out, const ASTEnum &en)
 {
-    generateENUMs(out, (QVector<ASTEnum>() << en), QStringLiteral("%1Enum").arg(en.name));
+    generateENUMs(out, (QList<ASTEnum>() << en), QStringLiteral("%1Enum").arg(en.name));
 }
 
 QString RepCodeGenerator::generateMetaTypeRegistration(const QSet<QString> &metaTypes)
@@ -582,7 +582,7 @@ QString RepCodeGenerator::generateMetaTypeRegistrationForPending(const QSet<QStr
     return out;
 }
 
-void RepCodeGenerator::generateStreamOperatorsForEnums(QTextStream &out, const QVector<QString> &enumUses)
+void RepCodeGenerator::generateStreamOperatorsForEnums(QTextStream &out, const QList<QString> &enumUses)
 {
     out << "QT_BEGIN_NAMESPACE" << Qt::endl;
     for (const QString &enumName : enumUses) {
@@ -751,7 +751,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
             out << metaTypeRegistrationCode << Qt::endl;
         out << "    }" << Qt::endl;
     } else {
-        QVector<int> constIndices;
+        QList<int> constIndices;
         for (int index = 0; index < astClass.properties.count(); ++index) {
             const ASTProperty &property = astClass.properties.at(index);
             if (property.modifier == ASTProperty::Constant)
@@ -864,7 +864,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
                     out << "    void " << property.name << "Changed(" << fullyQualifiedTypeName(astClass, className, typeForMode(property, mode)) << " " << property.name << ");" << Qt::endl;
             }
 
-            const QVector<ASTFunction> signalsList = transformEnumParams(astClass, astClass.signalsList, className);
+            const QList<ASTFunction> signalsList = transformEnumParams(astClass, astClass.signalsList, className);
             for (const ASTFunction &signal : signalsList)
                 out << "    void " << signal.name << "(" << signal.paramsAsString() << ");" << Qt::endl;
 
@@ -905,7 +905,7 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass
                     }
                 }
             }
-            const QVector<ASTFunction> slotsList = transformEnumParams(astClass, astClass.slotsList, className);
+            const QList<ASTFunction> slotsList = transformEnumParams(astClass, astClass.slotsList, className);
             for (const ASTFunction &slot : slotsList) {
                 const auto returnType = fullyQualifiedTypeName(astClass, className, slot.returnType);
                 if (mode != REPLICA) {
@@ -1031,7 +1031,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
                                   fullyQualifiedTypeName(astClass, QStringLiteral("typename ObjectType"), typeForMode(onChangeProperties.at(i), SOURCE)),
                                   QString::number(i)) << Qt::endl;
 
-    QVector<ASTFunction> signalsList = transformEnumParams(astClass, astClass.signalsList, QStringLiteral("typename ObjectType"));
+    QList<ASTFunction> signalsList = transformEnumParams(astClass, astClass.signalsList, QStringLiteral("typename ObjectType"));
     for (int i = 0; i < signalCount; ++i) {
         const ASTFunction &sig = signalsList.at(i);
         out << QString::fromLatin1("        m_signals[%1] = QtPrivate::qtro_signal_index<ObjectType>(&ObjectType::%2, "
@@ -1039,7 +1039,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
                              .arg(QString::number(changedCount+i+1), sig.name, sig.paramsAsString(ASTFunction::Normalized), QString::number(changedCount+i)) << Qt::endl;
     }
     const int slotCount = astClass.slotsList.count();
-    QVector<ASTProperty> pushProps;
+    QList<ASTProperty> pushProps;
     for (const ASTProperty &property : astClass.properties) {
         if (property.modifier == ASTProperty::ReadPush)
             pushProps << property;
@@ -1057,7 +1057,7 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
                                   QString::number(i)) << Qt::endl;
     }
 
-    QVector<ASTFunction> slotsList = transformEnumParams(astClass, astClass.slotsList, QStringLiteral("typename ObjectType"));
+    QList<ASTFunction> slotsList = transformEnumParams(astClass, astClass.slotsList, QStringLiteral("typename ObjectType"));
     for (int i = 0; i < slotCount; ++i) {
         const ASTFunction &slot = slotsList.at(i);
         const QString params = slot.paramsAsString(ASTFunction::Normalized);
@@ -1214,10 +1214,10 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("    }") << Qt::endl;
 
     //signalParameterNames method
-    out << QStringLiteral("    QList<QByteArray> signalParameterNames(int index) const override") << Qt::endl;
+    out << QStringLiteral("    QByteArrayList signalParameterNames(int index) const override") << Qt::endl;
     out << QStringLiteral("    {") << Qt::endl;
     out << QStringLiteral("        if (index < 0 || index >= m_signals[0])") << Qt::endl;
-    out << QStringLiteral("            return QList<QByteArray>();") << Qt::endl;
+    out << QStringLiteral("            return QByteArrayList();") << Qt::endl;
     out << QStringLiteral("        return ObjectType::staticMetaObject.method(m_signals[index + 1]).parameterNames();") << Qt::endl;
     out << QStringLiteral("    }") << Qt::endl;
 
@@ -1266,10 +1266,10 @@ void RepCodeGenerator::generateSourceAPI(QTextStream &out, const ASTClass &astCl
     out << QStringLiteral("    }") << Qt::endl;
 
     //methodParameterNames method
-    out << QStringLiteral("    QList<QByteArray> methodParameterNames(int index) const override") << Qt::endl;
+    out << QStringLiteral("    QByteArrayList methodParameterNames(int index) const override") << Qt::endl;
     out << QStringLiteral("    {") << Qt::endl;
     out << QStringLiteral("        if (index < 0 || index >= m_methods[0])") << Qt::endl;
-    out << QStringLiteral("            return QList<QByteArray>();") << Qt::endl;
+    out << QStringLiteral("            return QByteArrayList();") << Qt::endl;
     out << QStringLiteral("        return ObjectType::staticMetaObject.method(m_methods[index + 1]).parameterNames();") << Qt::endl;
     out << QStringLiteral("    }") << Qt::endl;
 
diff --git a/tools/repc/repcodegenerator.h b/tools/repc/repcodegenerator.h
index f3f5b4b..7a727e4 100644
--- a/tools/repc/repcodegenerator.h
+++ b/tools/repc/repcodegenerator.h
@@ -29,9 +29,9 @@
 #ifndef REPCODEGENERATOR_H
 #define REPCODEGENERATOR_H
 
+#include <QList>
 #include <QSet>
 #include <QString>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 struct AST;
@@ -63,14 +63,14 @@ private:
     void generateHeader(Mode mode, QTextStream &out, const AST &ast);
     QString generateMetaTypeRegistration(const QSet<QString> &metaTypes);
     QString generateMetaTypeRegistrationForPending(const QSet<QString> &metaTypes);
-    void generateStreamOperatorsForEnums(QTextStream &out, const QVector<QString> &enums);
+    void generateStreamOperatorsForEnums(QTextStream &out, const QList<QString> &enums);
 
     void generateSimpleSetter(QTextStream &out, const ASTProperty &property, bool generateOverride = true);
     void generatePOD(QTextStream &out, const POD &pod);
-    void generateENUMs(QTextStream &out, const QVector<ASTEnum> &enums, const QString &className);
-    void generateDeclarationsForEnums(QTextStream &out, const QVector<ASTEnum> &enums, bool generateQENUM=true);
-    void generateStreamOperatorsForEnums(QTextStream &out, const QVector<ASTEnum> &enums, const QString &className);
-    void generateConversionFunctionsForEnums(QTextStream &out, const QVector<ASTEnum> &enums);
+    void generateENUMs(QTextStream &out, const QList<ASTEnum> &enums, const QString &className);
+    void generateDeclarationsForEnums(QTextStream &out, const QList<ASTEnum> &enums, bool generateQENUM=true);
+    void generateStreamOperatorsForEnums(QTextStream &out, const QList<ASTEnum> &enums, const QString &className);
+    void generateConversionFunctionsForEnums(QTextStream &out, const QList<ASTEnum> &enums);
     void generateENUM(QTextStream &out, const ASTEnum &en);
     QString formatQPropertyDeclarations(const POD &pod);
     QString formatConstructors(const POD &pod);
diff --git a/tools/repc/utils.cpp b/tools/repc/utils.cpp
index 31714d0..9fb5735 100644
--- a/tools/repc/utils.cpp
+++ b/tools/repc/utils.cpp
@@ -107,7 +107,7 @@ namespace JSON
 
 using namespace JSON;
 
-static QByteArray join(const QVector<QByteArray> &array, const QByteArray &separator)
+static QByteArray join(const QByteArrayList &array, const QByteArray &separator)
 {
     QByteArray res;
     const int sz = array.size();
@@ -119,9 +119,9 @@ static QByteArray join(const QVector<QByteArray> &array, const QByteArray &separ
     return res;
 }
 
-static QVector<QByteArray> generateProperties(const QJsonArray &properties, bool isPod=false)
+static QByteArrayList generateProperties(const QJsonArray &properties, bool isPod=false)
 {
-    QVector<QByteArray> ret;
+    QByteArrayList ret;
     for (const QJsonValue prop : properties) {
         if (!isPod && !_Contains(prop, "notify") && !_Bool(prop, "constant")) {
             qWarning() << "Skipping property" << _String(prop, "name") << "because it is non-notifiable & non-constant";
@@ -222,17 +222,17 @@ QByteArray generateClass(const QJsonValue &cls, bool alwaysGenerateClass)
     return ret;
 }
 
-static QVector<PODAttribute> propertyList2PODAttributes(const QJsonArray &list)
+static QList<PODAttribute> propertyList2PODAttributes(const QJsonArray &list)
 {
-    QVector<PODAttribute> ret;
+    QList<PODAttribute> ret;
     for (const QJsonValue prop : list)
         ret.push_back(PODAttribute(_String(prop, "type"), _String(prop, "name")));
     return ret;
 }
 
-QVector<ASTProperty> propertyList2AstProperties(const QJsonArray &list)
+QList<ASTProperty> propertyList2AstProperties(const QJsonArray &list)
 {
-    QVector<ASTProperty> ret;
+    QList<ASTProperty> ret;
     for (const QJsonValue property : list) {
         if (!_Contains(property, "notify") && !_Bool(property, "constant")) {
             qWarning() << "Skipping property" << _String(property, "name") << "because it is non-notifiable & non-constant";
@@ -251,9 +251,9 @@ QVector<ASTProperty> propertyList2AstProperties(const QJsonArray &list)
     return ret;
 }
 
-QVector<ASTFunction> functionList2AstFunctionList(const QJsonArray &list)
+QList<ASTFunction> functionList2AstFunctionList(const QJsonArray &list)
 {
-    QVector<ASTFunction> ret;
+    QList<ASTFunction> ret;
     for (const QJsonValue function : list) {
         ASTFunction func;
         func.name = _String(function, "name");