Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I4bc7b2eb2913fc828f09f96e21480b76cabf8656
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

19 files changed, 65 insertions, 65 deletions

diff --git a/tests/auto/client/inputcontext/tst_inputcontext.cpp b/tests/auto/client/inputcontext/tst_inputcontext.cpp
index 1f07eb52..d421b0d2 100644
--- a/tests/auto/client/inputcontext/tst_inputcontext.cpp
+++ b/tests/auto/client/inputcontext/tst_inputcontext.cpp
@@ -85,7 +85,7 @@ QByteArray tst_inputcontext::inputContextName() const
 void tst_inputcontext::ensureTextInputPresentOnCompositor()
 {
     exec([&] {
-        QVector<TextInputManager *> extensions = getAll<TextInputManager>();
+        QList<TextInputManager *> extensions = getAll<TextInputManager>();
         if (extensions.length() > 1)
             QFAIL("TextInputManager is a singleton, hence there should not be more then one object returned");
         if (extensions.length() == 0)
@@ -96,7 +96,7 @@ void tst_inputcontext::ensureTextInputPresentOnCompositor()
 void tst_inputcontext::ensureTextInputNotPresentOnCompositor()
 {
     exec([&] {
-        QVector<TextInputManager *> extensions = getAll<TextInputManager>();
+        QList<TextInputManager *> extensions = getAll<TextInputManager>();
         if (extensions.length() > 1)
             QFAIL("TextInputManager is a singleton, hence there should not be more then one object returned");
         if (extensions.length() == 1)
diff --git a/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp b/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp
index 660d1f83..f7a63d13 100644
--- a/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp
+++ b/tests/auto/client/primaryselectionv1/tst_primaryselectionv1.cpp
@@ -140,7 +140,7 @@ public:
 
     PrimarySelectionDeviceManagerV1 *m_manager = nullptr;
     Seat *m_seat = nullptr;
-    QVector<PrimarySelectionOfferV1 *> m_sentSelectionOffers;
+    QList<PrimarySelectionOfferV1 *> m_sentSelectionOffers;
     PrimarySelectionSourceV1 *m_selectionSource = nullptr;
     uint m_serial = 0;
 
@@ -194,7 +194,7 @@ public:
 
     int m_version = 1; // TODO: Remove on libwayland upgrade
     QMap<Seat *, PrimarySelectionDeviceV1 *> m_devices;
-    QVector<PrimarySelectionSourceV1 *> m_sources;
+    QList<PrimarySelectionSourceV1 *> m_sources;
 protected:
     void zwp_primary_selection_device_manager_v1_destroy(Resource *resource) override
     {
@@ -459,7 +459,7 @@ void tst_primaryselectionv1::copy()
     window.show();
 
     QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
-    QVector<uint> mouseSerials;
+    QList<uint> mouseSerials;
     exec([&] {
         auto *surface = xdgSurface()->m_surface;
         keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol
diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
index 46d91e02..1c1e7a02 100644
--- a/tests/auto/client/seatv4/tst_seatv4.cpp
+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
@@ -292,7 +292,7 @@ void tst_seatv4::simpleAxis()
             QPoint pixelDelta;
             QPoint angleDelta; // eights of a degree, positive is upwards, left
         };
-        QVector<Event> m_events;
+        QList<Event> m_events;
     };
 
     WheelWindow window;
@@ -351,7 +351,7 @@ static bool supportsCursorSize(uint size, wl_shm *shm)
     return false;
 }
 
-static bool supportsCursorSizes(const QVector<uint> &sizes)
+static bool supportsCursorSizes(const QList<uint> &sizes)
 {
     auto *waylandIntegration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
     wl_shm *shm = waylandIntegration->display()->shm()->object();
diff --git a/tests/auto/client/seatv5/tst_seatv5.cpp b/tests/auto/client/seatv5/tst_seatv5.cpp
index 081a0aa7..2f7e70dc 100644
--- a/tests/auto/client/seatv5/tst_seatv5.cpp
+++ b/tests/auto/client/seatv5/tst_seatv5.cpp
@@ -161,7 +161,7 @@ public:
         QPoint angleDelta; // eights of a degree, positive is upwards, left
         Qt::MouseEventSource source{};
     };
-    QVector<Event> m_events;
+    QList<Event> m_events;
 };
 
 void tst_seatv5::simpleAxis_data()
@@ -401,7 +401,7 @@ public:
         Qt::TouchPointStates touchPointStates{};
         QList<QTouchEvent::TouchPoint> touchPoints;
     };
-    QVector<Event> m_events;
+    QList<Event> m_events;
 };
 
 void tst_seatv5::singleTap()
diff --git a/tests/auto/client/shared/corecompositor.h b/tests/auto/client/shared/corecompositor.h
index 254465ee..1b43fd70 100644
--- a/tests/auto/client/shared/corecompositor.h
+++ b/tests/auto/client/shared/corecompositor.h
@@ -145,10 +145,10 @@ public:
      * \brief Returns all globals with the given type, if any
      */
     template<typename global_type>
-    QVector<global_type *> getAll()
+    QList<global_type *> getAll()
     {
         warnIfNotLockedByThread(Q_FUNC_INFO);
-        QVector<global_type *> matching;
+        QList<global_type *> matching;
         for (auto *global : qAsConst(m_globals)) {
             if (auto *casted = qobject_cast<global_type *>(global))
                 matching.append(casted);
@@ -199,7 +199,7 @@ protected:
     QByteArray m_socketName;
     wl_event_loop *m_eventLoop = nullptr;
     bool m_running = true;
-    QVector<Global *> m_globals;
+    QList<Global *> m_globals;
     QElapsedTimer m_timer;
 
 private:
diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp
index 0d988521..c4181cb9 100644
--- a/tests/auto/client/shared/coreprotocol.cpp
+++ b/tests/auto/client/shared/coreprotocol.cpp
@@ -485,7 +485,7 @@ uint Keyboard::sendKey(wl_client *client, uint key, uint state)
 }
 
 // Shm implementation
-Shm::Shm(CoreCompositor *compositor, QVector<format> formats, int version)
+Shm::Shm(CoreCompositor *compositor, QList<format> formats, int version)
     : QtWaylandServer::wl_shm(compositor->m_display, version)
     , m_compositor(compositor)
     , m_formats(formats)
diff --git a/tests/auto/client/shared/coreprotocol.h b/tests/auto/client/shared/coreprotocol.h
index 8d5e2d66..8bc8deec 100644
--- a/tests/auto/client/shared/coreprotocol.h
+++ b/tests/auto/client/shared/coreprotocol.h
@@ -120,9 +120,9 @@ public:
         uint configureSerial = 0;
         int bufferScale = 1;
     } m_pending, m_committed;
-    QVector<DoubleBufferedState *> m_commits;
-    QVector<Callback *> m_waitingFrameCallbacks;
-    QVector<Output *> m_outputs;
+    QList<DoubleBufferedState *> m_commits;
+    QList<Callback *> m_waitingFrameCallbacks;
+    QList<Output *> m_outputs;
     SurfaceRole *m_role = nullptr;
 
 signals:
@@ -149,7 +149,7 @@ public:
     {}
     bool isClean() override;
     QString dirtyMessage() override;
-    QVector<Surface *> m_surfaces;
+    QList<Surface *> m_surfaces;
     CoreCompositor *m_compositor = nullptr;
 
 signals:
@@ -181,7 +181,7 @@ public:
     explicit SubCompositor(CoreCompositor *compositor, int version = 1)
         : QtWaylandServer::wl_subcompositor(compositor->m_display, version)
     {}
-    QVector<Subsurface *> m_subsurfaces;
+    QList<Subsurface *> m_subsurfaces;
 
 signals:
     void subsurfaceCreated(Subsurface *subsurface);
@@ -270,13 +270,13 @@ public:
     CoreCompositor *m_compositor = nullptr;
 
     Pointer* m_pointer = nullptr;
-    QVector<Pointer *> m_oldPointers;
+    QList<Pointer *> m_oldPointers;
 
     Touch* m_touch = nullptr;
-    QVector<Touch *> m_oldTouchs;
+    QList<Touch *> m_oldTouchs;
 
     Keyboard* m_keyboard = nullptr;
-    QVector<Keyboard *> m_oldKeyboards;
+    QList<Keyboard *> m_oldKeyboards;
 
     uint m_capabilities = 0;
 
@@ -313,7 +313,7 @@ public:
     void sendFrame(wl_client *client);
 
     Seat *m_seat = nullptr;
-    QVector<uint> m_enterSerials;
+    QList<uint> m_enterSerials;
     QPoint m_hotspot;
 
 signals:
@@ -365,11 +365,11 @@ class Shm : public Global, public QtWaylandServer::wl_shm
 {
     Q_OBJECT
 public:
-    explicit Shm(CoreCompositor *compositor, QVector<format> formats = {format_argb8888, format_xrgb8888, format_rgb888}, int version = 1);
+    explicit Shm(CoreCompositor *compositor, QList<format> formats = {format_argb8888, format_xrgb8888, format_rgb888}, int version = 1);
     bool isClean() override;
     CoreCompositor *m_compositor = nullptr;
-    QVector<ShmPool *> m_pools;
-    const QVector<format> m_formats;
+    QList<ShmPool *> m_pools;
+    const QList<format> m_formats;
 
 protected:
     void shm_create_pool(Resource *resource, uint32_t id, int32_t fd, int32_t size) override;
@@ -386,7 +386,7 @@ class ShmPool : QObject, public QtWaylandServer::wl_shm_pool
 public:
     explicit ShmPool(Shm *shm, wl_client *client, int id, int version = 1);
     Shm *m_shm = nullptr;
-    QVector<ShmBuffer *> m_buffers;
+    QList<ShmBuffer *> m_buffers;
 
 protected:
     void shm_pool_create_buffer(Resource *resource, uint32_t id, int32_t offset, int32_t width, int32_t height, int32_t stride, uint32_t format) override;
diff --git a/tests/auto/client/shared/datadevice.h b/tests/auto/client/shared/datadevice.h
index 98e780b2..a8c30f8f 100644
--- a/tests/auto/client/shared/datadevice.h
+++ b/tests/auto/client/shared/datadevice.h
@@ -71,7 +71,7 @@ public:
 
     DataDeviceManager *m_manager = nullptr;
     Seat *m_seat = nullptr;
-    QVector<DataOffer *> m_sentSelectionOffers;
+    QList<DataOffer *> m_sentSelectionOffers;
 
 protected:
     void data_device_release(Resource *resource) override
diff --git a/tests/auto/client/shared/xdgshell.cpp b/tests/auto/client/shared/xdgshell.cpp
index 72582f48..79d5ea38 100644
--- a/tests/auto/client/shared/xdgshell.cpp
+++ b/tests/auto/client/shared/xdgshell.cpp
@@ -168,12 +168,12 @@ XdgToplevel::XdgToplevel(XdgSurface *xdgSurface, int id, int version)
     connect(surface(), &Surface::commit, this, [this] { m_committed = m_pending; });
 }
 
-void XdgToplevel::sendConfigure(const QSize &size, const QVector<uint> &states)
+void XdgToplevel::sendConfigure(const QSize &size, const QList<uint> &states)
 {
     send_configure(size.width(), size.height(), toByteArray(states));
 }
 
-uint XdgToplevel::sendCompleteConfigure(const QSize &size, const QVector<uint> &states)
+uint XdgToplevel::sendCompleteConfigure(const QSize &size, const QList<uint> &states)
 {
     sendConfigure(size, states);
     return m_xdgSurface->sendConfigure();
diff --git a/tests/auto/client/shared/xdgshell.h b/tests/auto/client/shared/xdgshell.h
index 618babde..485da9d9 100644
--- a/tests/auto/client/shared/xdgshell.h
+++ b/tests/auto/client/shared/xdgshell.h
@@ -48,7 +48,7 @@ public:
     void send_ping(uint32_t) = delete; // It's a global, use resource specific instead
     bool isClean() override { return m_xdgSurfaces.empty(); }
     QString dirtyMessage() override { return m_xdgSurfaces.empty() ? "clean" : "remaining xdg surfaces"; }
-    QVector<XdgSurface *> m_xdgSurfaces;
+    QList<XdgSurface *> m_xdgSurfaces;
     XdgToplevel *toplevel(int i = 0);
     XdgPopup *popup(int i = 0);
     XdgPopup *m_topmostGrabbingPopup = nullptr;
@@ -86,13 +86,13 @@ public:
     XdgWmBase *m_xdgWmBase = nullptr;
     Surface *m_surface = nullptr;
     bool m_configureSent = false;
-    QVector<uint> m_pendingConfigureSerials;
+    QList<uint> m_pendingConfigureSerials;
     uint m_ackedConfigureSerial = 0;
     uint m_committedConfigureSerial = 0;
     struct DoubleBufferedState {
         QRect windowGeometry = {0, 0, 0, 0};
     } m_pending, m_committed;
-    QVector<XdgPopup *> m_popups;
+    QList<XdgPopup *> m_popups;
 
 public slots:
     void verifyConfigured() { QVERIFY(m_configureSent); }
@@ -115,8 +115,8 @@ class XdgToplevel : public QObject, public QtWaylandServer::xdg_toplevel
     Q_OBJECT
 public:
     explicit XdgToplevel(XdgSurface *xdgSurface, int id, int version = 1);
-    void sendConfigure(const QSize &size = {0, 0}, const QVector<uint> &states = {});
-    uint sendCompleteConfigure(const QSize &size = {0, 0}, const QVector<uint> &states = {});
+    void sendConfigure(const QSize &size = {0, 0}, const QList<uint> &states = {});
+    uint sendCompleteConfigure(const QSize &size = {0, 0}, const QList<uint> &states = {});
     Surface *surface() { return m_xdgSurface->m_surface; }
 
     XdgSurface *m_xdgSurface = nullptr;
diff --git a/tests/auto/client/shared_old/mockcompositor.cpp b/tests/auto/client/shared_old/mockcompositor.cpp
index 9553076d..43b9ec83 100644
--- a/tests/auto/client/shared_old/mockcompositor.cpp
+++ b/tests/auto/client/shared_old/mockcompositor.cpp
@@ -199,7 +199,7 @@ void MockCompositor::sendIviSurfaceConfigure(const QSharedPointer<MockIviSurface
     processCommand(command);
 }
 
-void MockCompositor::sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size, const QVector<uint> &states)
+void MockCompositor::sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size, const QList<uint> &states)
 {
     Command command = makeCommand(Impl::Compositor::sendXdgToplevelV6Configure, m_compositor);
     command.parameters << QVariant::fromValue(toplevel);
@@ -221,7 +221,7 @@ QSharedPointer<MockSurface> MockCompositor::surface()
     QSharedPointer<MockSurface> result;
     lock();
     {
-        const QVector<Impl::Surface *> surfaces = m_compositor->surfaces();
+        const QList<Impl::Surface *> surfaces = m_compositor->surfaces();
         for (Impl::Surface *surface : surfaces) {
             // we don't want to mistake the cursor surface for a window surface
             if (surface->isMapped()) {
@@ -415,12 +415,12 @@ void registerResource(wl_list *list, wl_resource *resource)
     wl_resource_add_destroy_listener(resource, listener);
 }
 
-QVector<Surface *> Compositor::surfaces() const
+QList<Surface *> Compositor::surfaces() const
 {
     return m_surfaces;
 }
 
-QVector<Output *> Compositor::outputs() const
+QList<Output *> Compositor::outputs() const
 {
     return m_outputs;
 }
diff --git a/tests/auto/client/shared_old/mockcompositor.h b/tests/auto/client/shared_old/mockcompositor.h
index 2433ac00..32380399 100644
--- a/tests/auto/client/shared_old/mockcompositor.h
+++ b/tests/auto/client/shared_old/mockcompositor.h
@@ -38,11 +38,11 @@
 #include <wayland-server-core.h>
 
 #include <QImage>
+#include <QList>
 #include <QMutex>
 #include <QRect>
 #include <QSharedPointer>
 #include <QVariant>
-#include <QVector>
 #include <QWaitCondition>
 
 class MockCompositor;
@@ -74,8 +74,8 @@ public:
     uint32_t nextSerial();
     uint32_t time() { return ++m_time; }
 
-    QVector<Surface *> surfaces() const;
-    QVector<Output *> outputs() const;
+    QList<Surface *> surfaces() const;
+    QList<Output *> outputs() const;
 
     IviApplication *iviApplication() const;
     XdgShellV6 *xdgShellV6() const;
@@ -130,8 +130,8 @@ private:
     Keyboard *m_keyboard = nullptr;
     Touch *m_touch = nullptr;
     QScopedPointer<DataDeviceManager> m_data_device_manager;
-    QVector<Surface *> m_surfaces;
-    QVector<Output *> m_outputs;
+    QList<Surface *> m_surfaces;
+    QList<Output *> m_outputs;
     QScopedPointer<IviApplication> m_iviApplication;
     QScopedPointer<WlShell> m_wlShell;
     QScopedPointer<XdgShellV6> m_xdgShellV6;
@@ -242,7 +242,7 @@ public:
     void sendShellSurfaceConfigure(const QSharedPointer<MockSurface> surface, const QSize &size = QSize(0, 0));
     void sendIviSurfaceConfigure(const QSharedPointer<MockIviSurface> iviSurface, const QSize &size);
     void sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size = QSize(0, 0),
-                                    const QVector<uint> &states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED });
+                                    const QList<uint> &states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED });
     void waitForStartDrag();
 
     QSharedPointer<MockSurface> surface();
diff --git a/tests/auto/client/shared_old/mockfullscreenshellv1.h b/tests/auto/client/shared_old/mockfullscreenshellv1.h
index 819bbc18..c932d4f4 100644
--- a/tests/auto/client/shared_old/mockfullscreenshellv1.h
+++ b/tests/auto/client/shared_old/mockfullscreenshellv1.h
@@ -31,7 +31,7 @@
 
 #include <qwayland-server-fullscreen-shell-unstable-v1.h>
 
-#include <QVector>
+#include <QList>
 
 namespace Impl {
 
@@ -43,14 +43,14 @@ class FullScreenShellV1 : public QtWaylandServer::zwp_fullscreen_shell_v1
 public:
     explicit FullScreenShellV1(::wl_display *display) : zwp_fullscreen_shell_v1(display, 1) {}
 
-    QVector<Surface *> surfaces() const { return m_surfaces; }
+    QList<Surface *> surfaces() const { return m_surfaces; }
     void removeSurface(Surface *surface) { m_surfaces.removeOne(surface); }
 
 protected:
     void zwp_fullscreen_shell_v1_present_surface(Resource *resource, struct ::wl_resource *surface, uint32_t method, struct ::wl_resource *output) override;
 
 private:
-    QVector<Surface *> m_surfaces;
+    QList<Surface *> m_surfaces;
 };
 
 } // namespace Impl
diff --git a/tests/auto/client/shared_old/mockiviapplication.h b/tests/auto/client/shared_old/mockiviapplication.h
index 4d65eeab..e2e3cb46 100644
--- a/tests/auto/client/shared_old/mockiviapplication.h
+++ b/tests/auto/client/shared_old/mockiviapplication.h
@@ -31,8 +31,8 @@
 
 #include <qwayland-server-ivi-application.h>
 
+#include <QList>
 #include <QSharedPointer>
-#include <QVector>
 
 class MockIviSurface;
 
@@ -67,7 +67,7 @@ class IviApplication : public QtWaylandServer::ivi_application
 {
 public:
     explicit IviApplication(::wl_display *display) : ivi_application(display, 1) {}
-    QVector<IviSurface *> iviSurfaces() const { return m_iviSurfaces; }
+    QList<IviSurface *> iviSurfaces() const { return m_iviSurfaces; }
 
 protected:
     void ivi_application_surface_create(Resource *resource, uint32_t ivi_id, ::wl_resource *surface, uint32_t id) override;
@@ -75,7 +75,7 @@ protected:
 private:
     void addIviSurface(IviSurface *iviSurface) { m_iviSurfaces.append(iviSurface); }
     void removeIviSurface(IviSurface *iviSurface) { m_iviSurfaces.removeOne(iviSurface); }
-    QVector<IviSurface *> m_iviSurfaces;
+    QList<IviSurface *> m_iviSurfaces;
 
     friend class IviSurface;
 };
diff --git a/tests/auto/client/shared_old/mocksurface.cpp b/tests/auto/client/shared_old/mocksurface.cpp
index e9df5f90..8ad45ae4 100644
--- a/tests/auto/client/shared_old/mocksurface.cpp
+++ b/tests/auto/client/shared_old/mocksurface.cpp
@@ -42,7 +42,7 @@ void Compositor::sendShellSurfaceConfigure(void *data, const QList<QVariant> &pa
     QSize size = parameters.at(1).toSize();
     Q_ASSERT(size.isValid());
     if (auto toplevel = surface->xdgToplevelV6()) {
-        QVector<uint> states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED };
+        QList<uint> states = { ZXDG_TOPLEVEL_V6_STATE_ACTIVATED };
         auto statesBytes = QByteArray::fromRawData(reinterpret_cast<const char *>(states.data()),
                                                    states.size() * static_cast<int>(sizeof(uint)));
         toplevel->send_configure(size.width(), size.height(), statesBytes);
diff --git a/tests/auto/client/shared_old/mockxdgshellv6.h b/tests/auto/client/shared_old/mockxdgshellv6.h
index a238fa56..4528dd1b 100644
--- a/tests/auto/client/shared_old/mockxdgshellv6.h
+++ b/tests/auto/client/shared_old/mockxdgshellv6.h
@@ -28,8 +28,8 @@
 
 #include <qwayland-server-xdg-shell-unstable-v6.h>
 
+#include <QList>
 #include <QSharedPointer>
-#include <QVector>
 
 #ifndef MOCKXDGSHELLV6_H
 #define MOCKXDGSHELLV6_H
@@ -96,7 +96,7 @@ class XdgShellV6 : public QtWaylandServer::zxdg_shell_v6
 {
 public:
     explicit XdgShellV6(::wl_display *display) : zxdg_shell_v6(display, 1) {}
-    QVector<XdgToplevelV6 *> toplevels() const { return m_toplevels; }
+    QList<XdgToplevelV6 *> toplevels() const { return m_toplevels; }
 
 protected:
     void zxdg_shell_v6_get_xdg_surface(Resource *resource, uint32_t id, ::wl_resource *surface) override;
@@ -104,7 +104,7 @@ protected:
 private:
     void addToplevel(XdgToplevelV6 *toplevel) { m_toplevels.append(toplevel); }
     void removeToplevel(XdgToplevelV6 *toplevel) { m_toplevels.removeOne(toplevel); }
-    QVector<XdgToplevelV6 *> m_toplevels;
+    QList<XdgToplevelV6 *> m_toplevels;
 
     friend class XdgToplevelV6;
 };
diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp
index 03fb2933..1c48a77f 100644
--- a/tests/auto/client/tabletv2/tst_tabletv2.cpp
+++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp
@@ -208,12 +208,12 @@ public:
 
     TabletManagerV2 *m_manager = nullptr;
     Seat *m_seat = nullptr;
-    QVector<TabletV2 *> m_tablets;
-    QVector<TabletV2 *> m_tabletsWaitingForDestroy;
-    QVector<TabletToolV2 *> m_tools;
-    QVector<TabletToolV2 *> m_toolsWaitingForDestroy;
-    QVector<TabletPadV2 *> m_pads;
-    QVector<TabletPadV2 *> m_padsWaitingForDestroy;
+    QList<TabletV2 *> m_tablets;
+    QList<TabletV2 *> m_tabletsWaitingForDestroy;
+    QList<TabletToolV2 *> m_tools;
+    QList<TabletToolV2 *> m_toolsWaitingForDestroy;
+    QList<TabletPadV2 *> m_pads;
+    QList<TabletPadV2 *> m_padsWaitingForDestroy;
 
 protected:
     void zwp_tablet_seat_v2_bind_resource(Resource *resource)
@@ -445,7 +445,7 @@ class ProximityFilter : public QObject {
 public:
     ProximityFilter() { qApp->installEventFilter(this); }
     ~ProximityFilter() override { qDeleteAll(m_events); }
-    QVector<QTabletEvent *> m_events;
+    QList<QTabletEvent *> m_events;
 
     int nextEventIndex = 0;
     int numEvents() const { return m_events.size() - nextEventIndex; }
@@ -621,7 +621,7 @@ signals:
     void tabletEventReceived(QTabletEvent *event);
 
 private:
-    QVector<QTabletEvent *> m_events;
+    QList<QTabletEvent *> m_events;
 };
 
 void tst_tabletv2::moveEvent()
diff --git a/tests/auto/client/xdgshell/tst_xdgshell.cpp b/tests/auto/client/xdgshell/tst_xdgshell.cpp
index eabf29b7..3007fb32 100644
--- a/tests/auto/client/xdgshell/tst_xdgshell.cpp
+++ b/tests/auto/client/xdgshell/tst_xdgshell.cpp
@@ -370,7 +370,7 @@ void tst_xdgshell::switchPopups()
             m_popups << new Popup(this);
         }
         ~Window() override { qDeleteAll(m_popups); }
-        QVector<Popup *> m_popups;
+        QList<Popup *> m_popups;
     };
 
     Window window;
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 1397414a..0904a499 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -1107,7 +1107,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     QTRY_VERIFY(!toplevel->fullscreen());
     QTRY_VERIFY(!toplevel->resizing());
 
-    toplevel->sendConfigure(QSize(10, 20), QVector<QWaylandXdgToplevel::State>{QWaylandXdgToplevel::State::ActivatedState});
+    toplevel->sendConfigure(QSize(10, 20), QList<QWaylandXdgToplevel::State>{QWaylandXdgToplevel::State::ActivatedState});
     compositor.flushClients();
     QTRY_COMPARE(mockToplevel.configureStates, QList<uint>{QWaylandXdgToplevel::State::ActivatedState});
     QTRY_COMPARE(mockToplevel.configureSize, QSize(10, 20));
@@ -1154,7 +1154,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     QTRY_VERIFY(mockToplevel.configureStates.contains(QWaylandXdgToplevel::State::ActivatedState));
     QTRY_VERIFY(!mockToplevel.configureStates.contains(QWaylandXdgToplevel::State::FullscreenState));
 
-    toplevel->sendConfigure(QSize(0, 0), QVector<QWaylandXdgToplevel::State>{});
+    toplevel->sendConfigure(QSize(0, 0), QList<QWaylandXdgToplevel::State>{});
     compositor.flushClients();
     QTRY_VERIFY(!mockToplevel.configureStates.contains(QWaylandXdgToplevel::State::ActivatedState));