Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I666a060351f73783e15e3f96884c9393a5cd7e46
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

54 files changed, 122 insertions, 124 deletions

diff --git a/examples/webenginewidgets/cookiebrowser/mainwindow.h b/examples/webenginewidgets/cookiebrowser/mainwindow.h
index 643ff9322..b6aee1c24 100644
--- a/examples/webenginewidgets/cookiebrowser/mainwindow.h
+++ b/examples/webenginewidgets/cookiebrowser/mainwindow.h
@@ -98,7 +98,7 @@ private slots:
 
 private:
     QWebEngineCookieStore *m_store;
-    QVector<QNetworkCookie> m_cookies;
+    QList<QNetworkCookie> m_cookies;
     QVBoxLayout *m_layout;
 };
 
diff --git a/examples/webenginewidgets/simplebrowser/browser.h b/examples/webenginewidgets/simplebrowser/browser.h
index 4c17121df..cb84ea670 100644
--- a/examples/webenginewidgets/simplebrowser/browser.h
+++ b/examples/webenginewidgets/simplebrowser/browser.h
@@ -53,7 +53,7 @@
 
 #include "downloadmanagerwidget.h"
 
-#include <QVector>
+#include <QList>
 #include <QWebEngineProfile>
 
 class BrowserWindow;
@@ -63,7 +63,7 @@ class Browser
 public:
     Browser();
 
-    QVector<BrowserWindow*> windows() { return m_windows; }
+    QList<BrowserWindow*> windows() { return m_windows; }
 
     BrowserWindow *createWindow(bool offTheRecord = false);
     BrowserWindow *createDevToolsWindow();
@@ -71,7 +71,7 @@ public:
     DownloadManagerWidget &downloadManagerWidget() { return m_downloadManagerWidget; }
 
 private:
-    QVector<BrowserWindow*> m_windows;
+    QList<BrowserWindow*> m_windows;
     DownloadManagerWidget m_downloadManagerWidget;
     QScopedPointer<QWebEngineProfile> m_otrProfile;
 };
diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
index c752aaf69..a2dcfc6c4 100644
--- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp
+++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
@@ -315,7 +315,7 @@ QMenu *BrowserWindow::createWindowMenu(TabWidget *tabWidget)
         menu->addAction(previousTabAction);
         menu->addSeparator();
 
-        QVector<BrowserWindow*> windows = m_browser->windows();
+        QList<BrowserWindow*> windows = m_browser->windows();
         int index(-1);
         for (auto window : windows) {
             QAction *action = menu->addAction(window->windowTitle(), this, &BrowserWindow::handleShowWindowTriggered);
@@ -524,7 +524,7 @@ void BrowserWindow::handleShowWindowTriggered()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
         int offset = action->data().toInt();
-        QVector<BrowserWindow*> windows = m_browser->windows();
+        QList<BrowserWindow*> windows = m_browser->windows();
         windows.at(offset)->activateWindow();
         windows.at(offset)->currentTab()->setFocus();
     }
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp
index 84f273328..462a63b26 100644
--- a/src/core/api/qwebengineclientcertificatestore.cpp
+++ b/src/core/api/qwebengineclientcertificatestore.cpp
@@ -88,9 +88,9 @@ void QWebEngineClientCertificateStore::add(const QSslCertificate &certificate, c
     Returns an empty list if the store does not contain any certificates.
 */
 
-QVector<QSslCertificate> QWebEngineClientCertificateStore::certificates() const
+QList<QSslCertificate> QWebEngineClientCertificateStore::certificates() const
 {
-    QVector<QSslCertificate> certificateList;
+    QList<QSslCertificate> certificateList;
     for (auto data : qAsConst(m_storeData->extraCerts))
         certificateList.append(data->certificate);
     return certificateList;
diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h
index a4c83bb2e..31a6b9c38 100644
--- a/src/core/api/qwebengineclientcertificatestore.h
+++ b/src/core/api/qwebengineclientcertificatestore.h
@@ -42,7 +42,7 @@
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtNetwork/qsslcertificate.h>
 #include <QtNetwork/qsslkey.h>
 
@@ -59,7 +59,7 @@ class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateStore {
 
 public:
     void add(const QSslCertificate &certificate, const QSslKey &privateKey);
-    QVector<QSslCertificate> certificates() const;
+    QList<QSslCertificate> certificates() const;
     void remove(const QSslCertificate &certificate);
     void clear();
 
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h
index a79e2b095..e6fa245c2 100644
--- a/src/core/api/qwebenginecookiestore_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -56,7 +56,7 @@
 #include "qwebenginecallback_p.h"
 #include "qwebenginecookiestore.h"
 
-#include <QVector>
+#include <QList>
 #include <QNetworkCookie>
 #include <QUrl>
 
@@ -79,7 +79,7 @@ class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate {
 public:
     QtWebEngineCore::CallbackDirectory callbackDirectory;
     std::function<bool(const QWebEngineCookieStore::FilterRequest &)> filterCallback;
-    QVector<CookieData> m_pendingUserCookies;
+    QList<CookieData> m_pendingUserCookies;
     quint64 m_nextCallbackId;
     bool m_deleteSessionCookiesPending;
     bool m_deleteAllCookiesPending;
diff --git a/src/core/api/qwebenginehttprequest.cpp b/src/core/api/qwebenginehttprequest.cpp
index 3395cc99f..f5733cde4 100644
--- a/src/core/api/qwebenginehttprequest.cpp
+++ b/src/core/api/qwebenginehttprequest.cpp
@@ -72,7 +72,7 @@ public:
     QUrl url;
     QWebEngineHttpRequest::Method method;
     typedef QPair<QByteArray, QByteArray> HeaderPair;
-    typedef QVector<HeaderPair> Headers;
+    typedef QList<HeaderPair> Headers;
     Headers headers;
     QByteArray postData;
 
@@ -96,7 +96,7 @@ public:
 
     Headers::ConstIterator findHeader(const QByteArray &key) const;
     Headers allHeaders() const;
-    QVector<QByteArray> headersKeys() const;
+    QList<QByteArray> headersKeys() const;
     void setHeader(const QByteArray &key, const QByteArray &value);
     void unsetHeader(const QByteArray &key);
     void setAllHeaders(const Headers &list);
@@ -293,7 +293,7 @@ QByteArray QWebEngineHttpRequest::header(const QByteArray &headerName) const
 
     \sa setHeader(), header(), hasHeader(), unsetHeader()
 */
-QVector<QByteArray> QWebEngineHttpRequest::headers() const
+QList<QByteArray> QWebEngineHttpRequest::headers() const
 {
     return d->headersKeys();
 }
@@ -339,9 +339,9 @@ QWebEngineHttpRequestPrivate::Headers QWebEngineHttpRequestPrivate::allHeaders()
     return headers;
 }
 
-QVector<QByteArray> QWebEngineHttpRequestPrivate::headersKeys() const
+QList<QByteArray> QWebEngineHttpRequestPrivate::headersKeys() const
 {
-    QVector<QByteArray> result;
+    QList<QByteArray> result;
     result.reserve(headers.size());
     Headers::ConstIterator it = headers.constBegin(), end = headers.constEnd();
     for (; it != end; ++it)
diff --git a/src/core/api/qwebenginehttprequest.h b/src/core/api/qwebenginehttprequest.h
index 1c4d7837b..ce77c04dd 100644
--- a/src/core/api/qwebenginehttprequest.h
+++ b/src/core/api/qwebenginehttprequest.h
@@ -41,9 +41,9 @@
 #define QWEBENGINEHTTPREQUEST_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/qshareddata.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
+#include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qurl.h>
 
@@ -87,7 +87,7 @@ public:
     void setPostData(const QByteArray &postData);
 
     bool hasHeader(const QByteArray &headerName) const;
-    QVector<QByteArray> headers() const;
+    QList<QByteArray> headers() const;
     QByteArray header(const QByteArray &headerName) const;
     void setHeader(const QByteArray &headerName, const QByteArray &value);
     void unsetHeader(const QByteArray &headerName);
diff --git a/src/core/client_cert_select_controller.cpp b/src/core/client_cert_select_controller.cpp
index 0baaf2bc5..0bfdba851 100644
--- a/src/core/client_cert_select_controller.cpp
+++ b/src/core/client_cert_select_controller.cpp
@@ -132,7 +132,7 @@ void ClientCertSelectController::select(const QSslCertificate &certificate)
                  << "    Selected certificate needs to be one of the offered";
 }
 
-QVector<QSslCertificate> ClientCertSelectController::certificates() const
+QList<QSslCertificate> ClientCertSelectController::certificates() const
 {
     if (!m_certificates.isEmpty())
         return m_certificates;
diff --git a/src/core/client_cert_select_controller.h b/src/core/client_cert_select_controller.h
index f121c1155..59157f7cc 100644
--- a/src/core/client_cert_select_controller.h
+++ b/src/core/client_cert_select_controller.h
@@ -56,7 +56,7 @@
 
 #include <QtCore/QUrl>
 #if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtNetwork/QSslCertificate>
 #endif
 #include <memory>
@@ -85,14 +85,14 @@ public:
     void select(const QSslCertificate &certificate);
     void select(int index);
 
-    QVector<QSslCertificate> certificates() const;
+    QList<QSslCertificate> certificates() const;
 #endif
 
 private:
     QUrl m_hostAndPort;
     std::vector<std::unique_ptr<net::ClientCertIdentity>> m_clientCerts;
     std::unique_ptr<content::ClientCertificateDelegate> m_delegate;
-    mutable QVector<QSslCertificate> m_certificates;
+    mutable QList<QSslCertificate> m_certificates;
     bool m_selected;
 };
 
diff --git a/src/core/net/client_cert_store_data.h b/src/core/net/client_cert_store_data.h
index e47a909e4..4976ac936 100644
--- a/src/core/net/client_cert_store_data.h
+++ b/src/core/net/client_cert_store_data.h
@@ -46,7 +46,7 @@
 #if QT_CONFIG(ssl)
 #include "base/memory/ref_counted.h"
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtNetwork/qsslcertificate.h>
 #include <QtNetwork/qsslkey.h>
 
@@ -71,7 +71,7 @@ struct ClientCertificateStoreData
     void remove(const QSslCertificate &certificate);
     void clear();
 
-    QVector<Entry *> extraCerts;
+    QList<Entry *> extraCerts;
 };
 
 } // namespace QtWebEngineCore
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h
index efd56e50e..f59768004 100644
--- a/src/core/profile_adapter.h
+++ b/src/core/profile_adapter.h
@@ -58,7 +58,6 @@
 #include <QPointer>
 #include <QScopedPointer>
 #include <QString>
-#include <QVector>
 
 #include "api/qwebengineclientcertificatestore.h"
 #include "api/qwebenginecookiestore.h"
@@ -247,7 +246,7 @@ private:
     QHash<QByteArray, QSharedPointer<UserNotificationController>> m_persistentNotifications;
 
     QList<ProfileAdapterClient*> m_clients;
-    QVector<WebContentsAdapterClient *> m_webContentsAdapterClients;
+    QList<WebContentsAdapterClient *> m_webContentsAdapterClients;
     int m_httpCacheMaxSize;
     QrcUrlSchemeHandler m_qrcHandler;
 
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index e88c80bc8..389f53002 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -715,8 +715,8 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
     }
 
     // convert the custom headers into the format that chromium expects
-    QVector<QByteArray> headers = request.headers();
-    for (QVector<QByteArray>::const_iterator it = headers.cbegin(); it != headers.cend(); ++it) {
+    QList<QByteArray> headers = request.headers();
+    for (QList<QByteArray>::const_iterator it = headers.cbegin(); it != headers.cend(); ++it) {
         if (params.extra_headers.length() > 0)
             params.extra_headers += '\n';
         params.extra_headers += (*it).toStdString() + ": " + request.header(*it).toStdString();
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index bfef9a1df..861310e9b 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -53,7 +53,7 @@
 #include "find_text_helper.h"
 #include "javascript_dialog_manager_qt.h"
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 QT_FORWARD_DECLARE_CLASS(CertificateErrorController)
 QT_FORWARD_DECLARE_CLASS(ClientCertSelectController)
@@ -87,7 +87,7 @@ protected:
 
 private:
     WebContentsAdapterClient *m_viewClient;
-    QVector<content::FrameTreeNode *> m_observedNodes;
+    QList<content::FrameTreeNode *> m_observedNodes;
 };
 
 class SavePageInfo
@@ -215,7 +215,7 @@ private:
     int &streamCount(blink::mojom::MediaStreamType type);
 
     WebContentsAdapterClient *m_viewClient;
-    QVector<int64_t> m_loadingErrorFrameList;
+    QList<int64_t> m_loadingErrorFrameList;
     QScopedPointer<FaviconManager> m_faviconManager;
     QScopedPointer<FindTextHelper> m_findTextHelper;
     SavePageInfo m_savePageInfo;
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 25655bc71..5b0e9d0c1 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -132,7 +132,6 @@
 #include <QQuickWindow>
 #include <QStringList>
 #include <QSurfaceFormat>
-#include <QVector>
 #include <QNetworkProxy>
 #include <QtGui/qpa/qplatformintegration.h>
 #include <QtGui/private/qguiapplication_p.h>
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index e2190f8a2..fcc569969 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -47,7 +47,7 @@
 #include "base/values.h"
 
 #include <QtGui/qtgui-config.h>
-#include <QVector>
+#include <QList>
 
 namespace base {
 class RunLoop;
@@ -144,7 +144,7 @@ private:
     std::unique_ptr<QObject> m_globalQObject;
     std::unique_ptr<ProfileAdapter> m_defaultProfileAdapter;
     std::unique_ptr<DevToolsServerQt> m_devtoolsServer;
-    QVector<ProfileAdapter*> m_profileAdapters;
+    QList<ProfileAdapter*> m_profileAdapters;
 #if QT_CONFIG(accessibility)
     std::unique_ptr<AccessibilityActivationObserver> m_accessibilityActivationObserver;
 #endif
diff --git a/src/pdf/api/qpdflinkmodel_p_p.h b/src/pdf/api/qpdflinkmodel_p_p.h
index 0454d6755..0606b4746 100644
--- a/src/pdf/api/qpdflinkmodel_p_p.h
+++ b/src/pdf/api/qpdflinkmodel_p_p.h
@@ -82,7 +82,7 @@ public:
     };
 
     QPdfDocument *document = nullptr;
-    QVector<Link> links;
+    QList<Link> links;
     int page = 0;
 };
 
diff --git a/src/pdf/api/qpdfsearchmodel.h b/src/pdf/api/qpdfsearchmodel.h
index eb0fb831f..1a413c763 100644
--- a/src/pdf/api/qpdfsearchmodel.h
+++ b/src/pdf/api/qpdfsearchmodel.h
@@ -66,7 +66,7 @@ public:
     explicit QPdfSearchModel(QObject *parent = nullptr);
     ~QPdfSearchModel();
 
-    QVector<QPdfSearchResult> resultsOnPage(int page) const;
+    QList<QPdfSearchResult> resultsOnPage(int page) const;
     QPdfSearchResult resultAtIndex(int index) const;
 
     QPdfDocument *document() const;
diff --git a/src/pdf/api/qpdfsearchmodel_p.h b/src/pdf/api/qpdfsearchmodel_p.h
index 2a23706b2..551eff47c 100644
--- a/src/pdf/api/qpdfsearchmodel_p.h
+++ b/src/pdf/api/qpdfsearchmodel_p.h
@@ -74,8 +74,8 @@ public:
 
     QPdfDocument *document = nullptr;
     QString searchString;
-    QVector<bool> pagesSearched;
-    QVector<QVector<QPdfSearchResult>> searchResults;
+    QList<bool> pagesSearched;
+    QList<QList<QPdfSearchResult>> searchResults;
     int rowCountSoFar = 0;
     int updateTimerId = -1;
     int nextPageToUpdate = 0;
diff --git a/src/pdf/api/qpdfsearchresult.h b/src/pdf/api/qpdfsearchresult.h
index 2dfca2dc4..0acf03d52 100644
--- a/src/pdf/api/qpdfsearchresult.h
+++ b/src/pdf/api/qpdfsearchresult.h
@@ -38,8 +38,8 @@
 #define QPDFSEARCHRESULT_H
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qrect.h>
-#include <QtCore/qvector.h>
 #include <QtPdf/qpdfdestination.h>
 
 QT_BEGIN_NAMESPACE
@@ -51,7 +51,7 @@ class Q_PDF_EXPORT QPdfSearchResult : public QPdfDestination
     Q_GADGET
     Q_PROPERTY(QString contextBefore READ contextBefore)
     Q_PROPERTY(QString contextAfter READ contextAfter)
-    Q_PROPERTY(QVector<QRectF> rectangles READ rectangles)
+    Q_PROPERTY(QList<QRectF> rectangles READ rectangles)
 
 public:
     QPdfSearchResult();
@@ -59,10 +59,10 @@ public:
 
     QString contextBefore() const;
     QString contextAfter() const;
-    QVector<QRectF> rectangles() const;
+    QList<QRectF> rectangles() const;
 
 private:
-    QPdfSearchResult(int page, QVector<QRectF> rects, QString contextBefore, QString contextAfter);
+    QPdfSearchResult(int page, QList<QRectF> rects, QString contextBefore, QString contextAfter);
     QPdfSearchResult(QPdfSearchResultPrivate *d);
     friend class QPdfDocument;
     friend class QPdfSearchModelPrivate;
diff --git a/src/pdf/api/qpdfsearchresult_p.h b/src/pdf/api/qpdfsearchresult_p.h
index 615dce4e0..eca37890e 100644
--- a/src/pdf/api/qpdfsearchresult_p.h
+++ b/src/pdf/api/qpdfsearchresult_p.h
@@ -56,7 +56,7 @@ class QPdfSearchResultPrivate : public QPdfDestinationPrivate
 {
 public:
     QPdfSearchResultPrivate() = default;
-    QPdfSearchResultPrivate(int page, QVector<QRectF> rects, QString contextBefore, QString contextAfter) :
+    QPdfSearchResultPrivate(int page, QList<QRectF> rects, QString contextBefore, QString contextAfter) :
         QPdfDestinationPrivate(page, rects.first().topLeft(), 0),
         contextBefore(contextBefore),
         contextAfter(contextAfter),
@@ -64,7 +64,7 @@ public:
 
     QString contextBefore;
     QString contextAfter;
-    QVector<QRectF> rects;
+    QList<QRectF> rects;
 };
 
 QT_END_NAMESPACE
diff --git a/src/pdf/api/qpdfselection.h b/src/pdf/api/qpdfselection.h
index 9d91d46c7..70077fdb0 100644
--- a/src/pdf/api/qpdfselection.h
+++ b/src/pdf/api/qpdfselection.h
@@ -52,7 +52,7 @@ class Q_PDF_EXPORT QPdfSelection
 {
     Q_GADGET
     Q_PROPERTY(bool valid READ isValid)
-    Q_PROPERTY(QVector<QPolygonF> bounds READ bounds)
+    Q_PROPERTY(QList<QPolygonF> bounds READ bounds)
     Q_PROPERTY(QRectF boundingRectangle READ boundingRectangle)
     Q_PROPERTY(QString text READ text)
     Q_PROPERTY(int startIndex READ startIndex)
@@ -66,7 +66,7 @@ public:
     QPdfSelection &operator=(QPdfSelection &&other) noexcept { swap(other); return *this; }
     void swap(QPdfSelection &other) noexcept { d.swap(other.d); }
     bool isValid() const;
-    QVector<QPolygonF> bounds() const;
+    QList<QPolygonF> bounds() const;
     QString text() const;
     QRectF boundingRectangle() const;
     int startIndex() const;
@@ -77,7 +77,7 @@ public:
 
 private:
     QPdfSelection();
-    QPdfSelection(const QString &text, QVector<QPolygonF> bounds, QRectF boundingRect, int startIndex, int endIndex);
+    QPdfSelection(const QString &text, QList<QPolygonF> bounds, QRectF boundingRect, int startIndex, int endIndex);
     QPdfSelection(QPdfSelectionPrivate *d);
     friend class QPdfDocument;
     friend class QQuickPdfSelection;
diff --git a/src/pdf/api/qpdfselection_p.h b/src/pdf/api/qpdfselection_p.h
index 0577e5a31..37ca3a3ce 100644
--- a/src/pdf/api/qpdfselection_p.h
+++ b/src/pdf/api/qpdfselection_p.h
@@ -37,8 +37,8 @@
 #ifndef QPDFSELECTION_P_H
 #define QPDFSELECTION_P_H
 
+#include <QList>
 #include <QPolygonF>
-#include <QVector>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ class QPdfSelectionPrivate : public QSharedData
 {
 public:
     QPdfSelectionPrivate() = default;
-    QPdfSelectionPrivate(const QString &text, QVector<QPolygonF> bounds, QRectF boundingRect, int startIndex, int endIndex)
+    QPdfSelectionPrivate(const QString &text, QList<QPolygonF> bounds, QRectF boundingRect, int startIndex, int endIndex)
         : text(text),
           bounds(bounds),
           boundingRect(boundingRect),
@@ -54,7 +54,7 @@ public:
           endIndex(endIndex) { }
 
     QString text;
-    QVector<QPolygonF> bounds;
+    QList<QPolygonF> bounds;
     QRectF boundingRect;
     int startIndex;
     int endIndex;
diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp
index c9c365568..eb4cb8773 100644
--- a/src/pdf/qpdfbookmarkmodel.cpp
+++ b/src/pdf/qpdfbookmarkmodel.cpp
@@ -128,7 +128,7 @@ public:
     }
 
 private:
-    QVector<BookmarkNode*> m_childNodes;
+    QList<BookmarkNode*> m_childNodes;
     BookmarkNode *m_parentNode;
 
     QString m_title;
@@ -189,7 +189,7 @@ public:
 
             const int titleLength = int(FPDFBookmark_GetTitle(bookmark, nullptr, 0));
 
-            QVector<ushort> titleBuffer(titleLength);
+            QList<ushort> titleBuffer(titleLength);
             FPDFBookmark_GetTitle(bookmark, titleBuffer.data(), quint32(titleBuffer.length()));
 
             const FPDF_DEST dest = FPDFBookmark_GetDest(document, bookmark);
diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp
index e5d981c0a..9b83e9b8e 100644
--- a/src/pdf/qpdfdocument.cpp
+++ b/src/pdf/qpdfdocument.cpp
@@ -401,7 +401,7 @@ void QPdfDocumentPrivate::fpdf_AddSegment(_FX_DOWNLOADHINTS *pThis, size_t offse
 
 QString QPdfDocumentPrivate::getText(FPDF_TEXTPAGE textPage, int startIndex, int count)
 {
-    QVector<ushort> buf(count + 1);
+    QList<ushort> buf(count + 1);
     // TODO is that enough space in case one unicode character is more than one in utf-16?
     int len = FPDFText_GetText(textPage, startIndex, count, buf.data());
     Q_ASSERT(len - 1 <= count); // len is number of characters written, including the terminator
@@ -602,7 +602,7 @@ QVariant QPdfDocument::metaData(MetaDataField field) const
     QPdfMutexLocker lock;
     const unsigned long len = FPDF_GetMetaText(d->doc, fieldName.constData(), nullptr, 0);
 
-    QVector<ushort> buf(len);
+    QList<ushort> buf(len);
     FPDF_GetMetaText(d->doc, fieldName.constData(), buf.data(), buf.length());
     lock.unlock();
 
@@ -807,7 +807,7 @@ QPdfSelection QPdfDocument::getSelection(int page, QPointF start, QPointF end)
 
         int count = endIndex - startIndex;
         QString text = d->getText(textPage, startIndex, count);
-        QVector<QPolygonF> bounds;
+        QList<QPolygonF> bounds;
         QRectF hull;
         int rectCount = FPDFText_CountRects(textPage, startIndex, endIndex - startIndex);
         for (int i = 0; i < rectCount; ++i) {
@@ -844,7 +844,7 @@ QPdfSelection QPdfDocument::getSelectionAtIndex(int page, int startIndex, int ma
     int pageCount = FPDFText_CountChars(textPage);
     if (startIndex >= pageCount)
         return QPdfSelection();
-    QVector<QPolygonF> bounds;
+    QList<QPolygonF> bounds;
     QRectF hull;
     int rectCount = 0;
     QString text;
@@ -882,7 +882,7 @@ QPdfSelection QPdfDocument::getAllText(int page)
     if (count < 1)
         return QPdfSelection();
     QString text = d->getText(textPage, 0, count);
-    QVector<QPolygonF> bounds;
+    QList<QPolygonF> bounds;
     QRectF hull;
     int rectCount = FPDFText_CountRects(textPage, 0, count);
     for (int i = 0; i < rectCount; ++i) {
diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp
index 68ae7bc6d..2738aa533 100644
--- a/src/pdf/qpdflinkmodel.cpp
+++ b/src/pdf/qpdflinkmodel.cpp
@@ -239,7 +239,7 @@ void QPdfLinkModelPrivate::update()
                 if (len < 1) {
                     qCWarning(qLcLink) << "skipping link" << i << "with empty URL";
                 } else {
-                    QVector<unsigned short> buf(len);
+                    QList<unsigned short> buf(len);
                     int got = FPDFLink_GetURL(webLinks, i, buf.data(), len);
                     Q_ASSERT(got == len);
                     linkData.url = QString::fromUtf16(buf.data(), got - 1);
diff --git a/src/pdf/qpdfpagerenderer.cpp b/src/pdf/qpdfpagerenderer.cpp
index 460e95bed..cbff0ea8f 100644
--- a/src/pdf/qpdfpagerenderer.cpp
+++ b/src/pdf/qpdfpagerenderer.cpp
@@ -89,8 +89,8 @@ public:
         QPdfDocumentRenderOptions options;
     };
 
-    QVector<PageRequest> m_requests;
-    QVector<PageRequest> m_pendingRequests;
+    QList<PageRequest> m_requests;
+    QList<PageRequest> m_pendingRequests;
     quint64 m_requestIdCounter = 1;
 
     QThread *m_renderThread = nullptr;
diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp
index f87c1494f..eeb0a18ce 100644
--- a/src/pdf/qpdfsearchmodel.cpp
+++ b/src/pdf/qpdfsearchmodel.cpp
@@ -136,7 +136,7 @@ void QPdfSearchModel::setSearchString(QString searchString)
     endResetModel();
 }
 
-QVector<QPdfSearchResult> QPdfSearchModel::resultsOnPage(int page) const
+QList<QPdfSearchResult> QPdfSearchModel::resultsOnPage(int page) const
 {
     Q_D(const QPdfSearchModel);
     const_cast<QPdfSearchModelPrivate *>(d)->doSearch(page);
@@ -230,12 +230,12 @@ bool QPdfSearchModelPrivate::doSearch(int page)
         return false;
     }
     FPDF_SCHHANDLE sh = FPDFText_FindStart(textPage, searchString.utf16(), 0, 0);
-    QVector<QPdfSearchResult> newSearchResults;
+    QList<QPdfSearchResult> newSearchResults;
     while (FPDFText_FindNext(sh)) {
         int idx = FPDFText_GetSchResultIndex(sh);
         int count = FPDFText_GetSchCount(sh);
         int rectCount = FPDFText_CountRects(textPage, idx, count);
-        QVector<QRectF> rects;
+        QList<QRectF> rects;
         int startIndex = -1;
         int endIndex = -1;
         for (int r = 0; r < rectCount; ++r) {
@@ -258,7 +258,7 @@ bool QPdfSearchModelPrivate::doSearch(int page)
             endIndex += ContextChars;
             int count = endIndex - startIndex + 1;
             if (count > 0) {
-                QVector<ushort> buf(count + 1);
+                QList<ushort> buf(count + 1);
                 int len = FPDFText_GetText(textPage, startIndex, count, buf.data());
                 Q_ASSERT(len - 1 <= count); // len is number of characters written, including the terminator
                 QString context = QString::fromUtf16(buf.constData(), len - 1);
diff --git a/src/pdf/qpdfsearchresult.cpp b/src/pdf/qpdfsearchresult.cpp
index 53da1c165..629a8765f 100644
--- a/src/pdf/qpdfsearchresult.cpp
+++ b/src/pdf/qpdfsearchresult.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 QPdfSearchResult::QPdfSearchResult() :
     QPdfSearchResult(new QPdfSearchResultPrivate()) { }
 
-QPdfSearchResult::QPdfSearchResult(int page, QVector<QRectF> rects, QString contextBefore, QString contextAfter) :
+QPdfSearchResult::QPdfSearchResult(int page, QList<QRectF> rects, QString contextBefore, QString contextAfter) :
     QPdfSearchResult(new QPdfSearchResultPrivate(page, rects, contextBefore, contextAfter)) { }
 
 QPdfSearchResult::QPdfSearchResult(QPdfSearchResultPrivate *d) :
@@ -58,7 +58,7 @@ QString QPdfSearchResult::contextAfter() const
     return static_cast<QPdfSearchResultPrivate *>(d.data())->contextAfter;
 }
 
-QVector<QRectF> QPdfSearchResult::rectangles() const
+QList<QRectF> QPdfSearchResult::rectangles() const
 {
     return static_cast<QPdfSearchResultPrivate *>(d.data())->rects;
 }
diff --git a/src/pdf/qpdfselection.cpp b/src/pdf/qpdfselection.cpp
index 5f0ee3b20..b8ad02969 100644
--- a/src/pdf/qpdfselection.cpp
+++ b/src/pdf/qpdfselection.cpp
@@ -67,7 +67,7 @@ QPdfSelection::QPdfSelection()
     \a text string, and which take up space on the page within the polygon
     regions given in \a bounds.
 */
-QPdfSelection::QPdfSelection(const QString &text, QVector<QPolygonF> bounds, QRectF boundingRect, int startIndex, int endIndex)
+QPdfSelection::QPdfSelection(const QString &text, QList<QPolygonF> bounds, QRectF boundingRect, int startIndex, int endIndex)
   : d(new QPdfSelectionPrivate(text, bounds, boundingRect, startIndex, endIndex))
 {
 }
@@ -119,7 +119,7 @@ bool QPdfSelection::isValid() const
     are always rectangles; but in the future it may be possible to represent
     more complex regions.
 */
-QVector<QPolygonF> QPdfSelection::bounds() const
+QList<QPolygonF> QPdfSelection::bounds() const
 {
     return d->bounds;
 }
diff --git a/src/pdf/quick/qquickpdflinkmodel_p.h b/src/pdf/quick/qquickpdflinkmodel_p.h
index 23ad6c8c1..6f19daa28 100644
--- a/src/pdf/quick/qquickpdflinkmodel_p.h
+++ b/src/pdf/quick/qquickpdflinkmodel_p.h
@@ -75,7 +75,7 @@ private:
 
 private:
     QQuickPdfDocument *m_quickDocument;
-    QVector<QPolygonF> m_linksGeometry;
+    QList<QPolygonF> m_linksGeometry;
 
     Q_DISABLE_COPY(QQuickPdfLinkModel)
 };
diff --git a/src/pdf/quick/qquickpdfnavigationstack_p.h b/src/pdf/quick/qquickpdfnavigationstack_p.h
index 0d88d62fd..5df00add5 100644
--- a/src/pdf/quick/qquickpdfnavigationstack_p.h
+++ b/src/pdf/quick/qquickpdfnavigationstack_p.h
@@ -88,7 +88,7 @@ Q_SIGNALS:
     void jumped(int page, QPointF location, qreal zoom);
 
 private:
-    QVector<QExplicitlySharedDataPointer<QPdfDestinationPrivate>> m_pageHistory;
+    QList<QExplicitlySharedDataPointer<QPdfDestinationPrivate>> m_pageHistory;
     int m_currentHistoryIndex = 0;
     bool m_changing = false;
 
diff --git a/src/pdf/quick/qquickpdfsearchmodel.cpp b/src/pdf/quick/qquickpdfsearchmodel.cpp
index 1f62fbad0..a39178ba3 100644
--- a/src/pdf/quick/qquickpdfsearchmodel.cpp
+++ b/src/pdf/quick/qquickpdfsearchmodel.cpp
@@ -104,9 +104,9 @@ void QQuickPdfSearchModel::setDocument(QQuickPdfDocument *document)
 
     \sa PathMultiline
 */
-QVector<QPolygonF> QQuickPdfSearchModel::currentResultBoundingPolygons() const
+QList<QPolygonF> QQuickPdfSearchModel::currentResultBoundingPolygons() const
 {
-    QVector<QPolygonF> ret;
+    QList<QPolygonF> ret;
     const auto &results = const_cast<QQuickPdfSearchModel *>(this)->resultsOnPage(m_currentPage);
     if (m_currentResult < 0 || m_currentResult >= results.count())
         return ret;
@@ -172,7 +172,7 @@ void QQuickPdfSearchModel::onResultsChanged()
 
     \sa PathMultiline
 */
-QVector<QPolygonF> QQuickPdfSearchModel::currentPageBoundingPolygons() const
+QList<QPolygonF> QQuickPdfSearchModel::currentPageBoundingPolygons() const
 {
     return const_cast<QQuickPdfSearchModel *>(this)->boundingPolygonsOnPage(m_currentPage);
 }
@@ -203,14 +203,14 @@ QVector<QPolygonF> QQuickPdfSearchModel::currentPageBoundingPolygons() const
 
     \sa PathMultiline
 */
-QVector<QPolygonF> QQuickPdfSearchModel::boundingPolygonsOnPage(int page)
+QList<QPolygonF> QQuickPdfSearchModel::boundingPolygonsOnPage(int page)
 {
     if (!document() || searchString().isEmpty() || page < 0 || page > document()->pageCount())
         return {};
 
     updatePage(page);
 
-    QVector<QPolygonF> ret;
+    QList<QPolygonF> ret;
     auto m = QPdfSearchModel::resultsOnPage(page);
     for (auto result : m) {
         for (auto rect : result.rectangles())
diff --git a/src/pdf/quick/qquickpdfsearchmodel_p.h b/src/pdf/quick/qquickpdfsearchmodel_p.h
index 66fc583d9..3f0f6f4c1 100644
--- a/src/pdf/quick/qquickpdfsearchmodel_p.h
+++ b/src/pdf/quick/qquickpdfsearchmodel_p.h
@@ -62,8 +62,8 @@ class QQuickPdfSearchModel : public QPdfSearchModel
     Q_PROPERTY(QQuickPdfDocument *document READ document WRITE setDocument NOTIFY documentChanged)
     Q_PROPERTY(int currentPage READ currentPage WRITE setCurrentPage NOTIFY currentPageChanged)
     Q_PROPERTY(int currentResult READ currentResult WRITE setCurrentResult NOTIFY currentResultChanged)
-    Q_PROPERTY(QVector<QPolygonF> currentPageBoundingPolygons READ currentPageBoundingPolygons NOTIFY currentPageBoundingPolygonsChanged)
-    Q_PROPERTY(QVector<QPolygonF> currentResultBoundingPolygons READ currentResultBoundingPolygons NOTIFY currentResultBoundingPolygonsChanged)
+    Q_PROPERTY(QList<QPolygonF> currentPageBoundingPolygons READ currentPageBoundingPolygons NOTIFY currentPageBoundingPolygonsChanged)
+    Q_PROPERTY(QList<QPolygonF> currentResultBoundingPolygons READ currentResultBoundingPolygons NOTIFY currentResultBoundingPolygonsChanged)
     Q_PROPERTY(QRectF currentResultBoundingRect READ currentResultBoundingRect NOTIFY currentResultBoundingRectChanged)
 
 public:
@@ -72,7 +72,7 @@ public:
     QQuickPdfDocument *document() const;
     void setDocument(QQuickPdfDocument * document);
 
-    Q_INVOKABLE QVector<QPolygonF> boundingPolygonsOnPage(int page);
+    Q_INVOKABLE QList<QPolygonF> boundingPolygonsOnPage(int page);
 
     int currentPage() const { return m_currentPage; }
     void setCurrentPage(int currentPage);
@@ -80,8 +80,8 @@ public:
     int currentResult() const { return m_currentResult; }
     void setCurrentResult(int currentResult);
 
-    QVector<QPolygonF> currentPageBoundingPolygons() const;
-    QVector<QPolygonF> currentResultBoundingPolygons() const;
+    QList<QPolygonF> currentPageBoundingPolygons() const;
+    QList<QPolygonF> currentResultBoundingPolygons() const;
     QRectF currentResultBoundingRect() const;
 
 signals:
diff --git a/src/pdf/quick/qquickpdfselection.cpp b/src/pdf/quick/qquickpdfselection.cpp
index 23fbb80b9..bdedb4dfb 100644
--- a/src/pdf/quick/qquickpdfselection.cpp
+++ b/src/pdf/quick/qquickpdfselection.cpp
@@ -141,7 +141,7 @@ void QQuickPdfSelection::setDocument(QQuickPdfDocument *document)
 
     \sa PathMultiline
 */
-QVector<QPolygonF> QQuickPdfSelection::geometry() const
+QList<QPolygonF> QQuickPdfSelection::geometry() const
 {
     return m_geometry;
 }
diff --git a/src/pdf/quick/qquickpdfselection_p.h b/src/pdf/quick/qquickpdfselection_p.h
index ee7e1f85f..75631a876 100644
--- a/src/pdf/quick/qquickpdfselection_p.h
+++ b/src/pdf/quick/qquickpdfselection_p.h
@@ -70,7 +70,7 @@ class QQuickPdfSelection : public QQuickItem
     Q_PROPERTY(bool hold READ hold WRITE setHold NOTIFY holdChanged)
 
     Q_PROPERTY(QString text READ text NOTIFY textChanged)
-    Q_PROPERTY(QVector<QPolygonF> geometry READ geometry NOTIFY selectedAreaChanged)
+    Q_PROPERTY(QList<QPolygonF> geometry READ geometry NOTIFY selectedAreaChanged)
 
 public:
     explicit QQuickPdfSelection(QQuickItem *parent = nullptr);
@@ -89,7 +89,7 @@ public:
     void setHold(bool hold);
 
     QString text() const;
-    QVector<QPolygonF> geometry() const;
+    QList<QPolygonF> geometry() const;
 
     Q_INVOKABLE void clear();
     Q_INVOKABLE void selectAll();
@@ -131,7 +131,7 @@ private:
     mutable qreal m_heightAtCursor = 0;
     QString m_text;             // selected text
     mutable QString m_pageText; // all text on the page
-    QVector<QPolygonF> m_geometry;
+    QList<QPolygonF> m_geometry;
     int m_page = 0;
     int m_fromCharIndex = -1;   // same as anchor position
     mutable int m_toCharIndex = -1; // same as cursor position
diff --git a/src/pdfwidgets/qpdfview_p.h b/src/pdfwidgets/qpdfview_p.h
index 2df929e2e..7e758832c 100644
--- a/src/pdfwidgets/qpdfview_p.h
+++ b/src/pdfwidgets/qpdfview_p.h
@@ -104,7 +104,7 @@ public:
     QRect m_viewport;
 
     QHash<int, QImage> m_pageCache;
-    QVector<int> m_cachedPagesLRU;
+    QList<int> m_cachedPagesLRU;
     int m_pageCacheLimit;
 
     DocumentLayout m_documentLayout;
diff --git a/src/webengine/api/qquickwebengineclientcertificateselection.cpp b/src/webengine/api/qquickwebengineclientcertificateselection.cpp
index c48a59887..27e23d32f 100644
--- a/src/webengine/api/qquickwebengineclientcertificateselection.cpp
+++ b/src/webengine/api/qquickwebengineclientcertificateselection.cpp
@@ -162,7 +162,7 @@ QQuickWebEngineClientCertificateOption *QQuickWebEngineClientCertificateSelectio
 QQmlListProperty<QQuickWebEngineClientCertificateOption> QQuickWebEngineClientCertificateSelection::certificates()
 {
     if (m_certificates.empty()) {
-        QVector<QSslCertificate> certificates = d_ptr->certificates();
+        QList<QSslCertificate> certificates = d_ptr->certificates();
         for (int i = 0; i < certificates.count(); ++i)
             m_certificates.push_back(new QQuickWebEngineClientCertificateOption(this, i));
     }
diff --git a/src/webengine/api/qquickwebengineclientcertificateselection_p.h b/src/webengine/api/qquickwebengineclientcertificateselection_p.h
index adf8b5f7c..0f3ebb0e8 100644
--- a/src/webengine/api/qquickwebengineclientcertificateselection_p.h
+++ b/src/webengine/api/qquickwebengineclientcertificateselection_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtQml/QQmlListProperty>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
@@ -116,7 +116,7 @@ private:
 
     explicit QQuickWebEngineClientCertificateSelection(QSharedPointer<ClientCertSelectController>);
 
-    mutable QVector<QQuickWebEngineClientCertificateOption *> m_certificates;
+    mutable QList<QQuickWebEngineClientCertificateOption *> m_certificates;
     QSharedPointer<ClientCertSelectController> d_ptr;
 };
 
diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
index 9eca01bbe..e45c765ef 100644
--- a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
+++ b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
@@ -86,7 +86,7 @@ QWebEngineClientCertificateSelection::~QWebEngineClientCertificateSelection()
 
     \sa select()
 */
-QVector<QSslCertificate> QWebEngineClientCertificateSelection::certificates() const
+QList<QSslCertificate> QWebEngineClientCertificateSelection::certificates() const
 {
     return d_ptr->certificates();
 }
diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.h b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
index d451d09ae..cd28cf06c 100644
--- a/src/webenginewidgets/api/qwebengineclientcertificateselection.h
+++ b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
@@ -45,8 +45,8 @@
 
 #if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
 
+#include <QtCore/qlist.h>
 #include <QtCore/qscopedpointer.h>
-#include <QtCore/qvector.h>
 #include <QtNetwork/qsslcertificate.h>
 
 QT_BEGIN_NAMESPACE
@@ -63,7 +63,7 @@ public:
 
     void select(const QSslCertificate &certificate);
     void selectNone();
-    QVector<QSslCertificate> certificates() const;
+    QList<QSslCertificate> certificates() const;
 
 private:
     friend class QWebEnginePagePrivate;
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 350c15174..77ccaae59 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -525,8 +525,8 @@ void tst_QWebEngineUrlRequestInterceptor::requestInterceptorByResourceType_data(
     QTest::addColumn<int>("resourceType");
 
     QStringList name = { "ui", "io" };
-    QVector<InterceptorSetter> setters = { &QWebEngineProfile::setUrlRequestInterceptor,
-                                           &QWebEngineProfile::setRequestInterceptor };
+    QList<InterceptorSetter> setters = { &QWebEngineProfile::setUrlRequestInterceptor,
+                                         &QWebEngineProfile::setRequestInterceptor };
     for (int i = 0; i < 2; i++) {
         QTest::newRow(qPrintable(name[i] + "StyleSheet"))
                 << setters[i] << styleRequestUrl << firstPartyUrl
diff --git a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
index e690bfc11..c0706faaf 100644
--- a/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
+++ b/tests/auto/pdf/qpdfsearchmodel/tst_qpdfsearchmodel.cpp
@@ -58,7 +58,7 @@ void tst_QPdfSearchModel::findText()
 
     QPdfSearchModel model;
     model.setDocument(&document);
-    QVector<QRectF> matches = model.matches(1, "ai");
+    QList<QRectF> matches = model.matches(1, "ai");
 
     qDebug() << matches;
     QCOMPARE(matches.count(), 3);
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 0d830931d..d7dcb78e7 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -130,7 +130,7 @@ int main(int argc, char **argv)
     QLocale::setDefault(QLocale("en"));
 
     static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
-    QVector<const char *> w_argv(argc); \
+    QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
         w_argv[i] = argv[i]; \
     for (int i = 0; i < params.size(); ++i) \
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 6f78ddc4c..a95c231a1 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -1162,17 +1162,17 @@ void tst_QQuickWebEngineView::setProfile() {
 void tst_QQuickWebEngineView::focusChild_data()
 {
     QTest::addColumn<QString>("interfaceName");
-    QTest::addColumn<QVector<QAccessible::Role>>("ancestorRoles");
+    QTest::addColumn<QList<QAccessible::Role>>("ancestorRoles");
 
-    QTest::newRow("QQuickWebEngineView") << QString("QQuickWebEngineView") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("QQuickView") << QString("QQuickView") << QVector<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* view */});
+    QTest::newRow("QQuickWebEngineView") << QString("QQuickWebEngineView") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("QQuickView") << QString("QQuickView") << QList<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* view */});
 }
 
 void tst_QQuickWebEngineView::focusChild()
 {
     auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * {
-        QFETCH(QVector<QAccessible::Role>, ancestorRoles);
+        QFETCH(QList<QAccessible::Role>, ancestorRoles);
         for (int i = 0; i < ancestorRoles.size(); ++i) {
             if (iface->childCount() == 0 || iface->role() != ancestorRoles[i])
                 return nullptr;
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h
index b7b7b1564..132c353ca 100644
--- a/tests/auto/quick/shared/util.h
+++ b/tests/auto/quick/shared/util.h
@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) \
 { \
     QtWebEngine::initialize(); \
     \
-    QVector<const char *> w_argv(argc); \
+    QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
         w_argv[i] = argv[i]; \
     for (int i = 0; i < params.size(); ++i) \
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 748837c7f..e201ffbb4 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -151,17 +151,17 @@ void tst_Accessibility::hierarchy()
 void tst_Accessibility::focusChild_data()
 {
     QTest::addColumn<QString>("interfaceName");
-    QTest::addColumn<QVector<QAccessible::Role>>("ancestorRoles");
+    QTest::addColumn<QList<QAccessible::Role>>("ancestorRoles");
 
-    QTest::newRow("QWebEngineView") << QString("QWebEngineView") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QVector<QAccessible::Role>({QAccessible::Client});
-    QTest::newRow("QMainWindow") << QString("QMainWindow") << QVector<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* central widget */, QAccessible::Client /* view */});
+    QTest::newRow("QWebEngineView") << QString("QWebEngineView") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("RenderWidgetHostViewQtDelegate") << QString("RenderWidgetHostViewQtDelegate") << QList<QAccessible::Role>({QAccessible::Client});
+    QTest::newRow("QMainWindow") << QString("QMainWindow") << QList<QAccessible::Role>({QAccessible::Window, QAccessible::Client /* central widget */, QAccessible::Client /* view */});
 }
 
 void tst_Accessibility::focusChild()
 {
     auto traverseToWebDocumentAccessibleInterface = [](QAccessibleInterface *iface) -> QAccessibleInterface * {
-        QFETCH(QVector<QAccessible::Role>, ancestorRoles);
+        QFETCH(QList<QAccessible::Role>, ancestorRoles);
         for (int i = 0; i < ancestorRoles.size(); ++i) {
             if (iface->childCount() == 0 || iface->role() != ancestorRoles[i])
                 return nullptr;
diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp
index c4691ad74..95b0bdbb1 100644
--- a/tests/auto/widgets/origins/tst_origins.cpp
+++ b/tests/auto/widgets/origins/tst_origins.cpp
@@ -169,7 +169,7 @@ public:
         profile->installUrlSchemeHandler(QBAL("cors"), this);
     }
 
-    QVector<QUrl> &requests() { return m_requests; }
+    QList<QUrl> &requests() { return m_requests; }
 
 private:
     void requestStarted(QWebEngineUrlRequestJob *job) override
@@ -198,7 +198,7 @@ private:
         job->reply(mimeType, file);
     }
 
-    QVector<QUrl> m_requests;
+    QList<QUrl> m_requests;
 };
 
 class tst_Origins final : public QObject {
diff --git a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
index 6096d6345..1af6dd49f 100644
--- a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
+++ b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
@@ -742,7 +742,7 @@ void tst_QWebEngineDownloadItem::downloadViaSetUrl()
     });
 
     // Set up profile and download handler
-    QVector<QUrl> downloadUrls;
+    QList<QUrl> downloadUrls;
     ScopedConnection sc2 = connect(m_profile, &QWebEngineProfile::downloadRequested, [&](QWebEngineDownloadItem *item) {
         downloadUrls.append(item->url());
     });
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 72c580034..9768747ca 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1038,11 +1038,11 @@ void tst_QWebEnginePage::findText()
 void tst_QWebEnginePage::findTextResult()
 {
     QSignalSpy findTextSpy(m_view->page(), &QWebEnginePage::findTextFinished);
-    auto signalResult = [&findTextSpy]() -> QVector<int> {
+    auto signalResult = [&findTextSpy]() -> QList<int> {
         if (findTextSpy.count() != 1)
-            return QVector<int>({-1, -1});
+            return QList<int>({-1, -1});
         auto r = findTextSpy.takeFirst().value(0).value<QWebEngineFindTextResult>();
-        return QVector<int>({ r.numberOfMatches(), r.activeMatch() });
+        return QList<int>({ r.numberOfMatches(), r.activeMatch() });
     };
 
     // findText will abort in blink if the view has an empty size.
@@ -1054,21 +1054,21 @@ void tst_QWebEnginePage::findTextResult()
     QTRY_COMPARE(loadSpy.count(), 1);
 
     QCOMPARE(findTextSync(m_page, ""), false);
-    QCOMPARE(signalResult(), QVector<int>({0, 0}));
+    QCOMPARE(signalResult(), QList<int>({0, 0}));
 
     const QStringList words = { "foo", "bar" };
     for (const QString &subString : words) {
         QCOMPARE(findTextSync(m_page, subString), true);
-        QCOMPARE(signalResult(), QVector<int>({1, 1}));
+        QCOMPARE(signalResult(), QList<int>({1, 1}));
 
         QCOMPARE(findTextSync(m_page, ""), false);
-        QCOMPARE(signalResult(), QVector<int>({0, 0}));
+        QCOMPARE(signalResult(), QList<int>({0, 0}));
     }
 
     QCOMPARE(findTextSync(m_page, "blahhh"), false);
-    QCOMPARE(signalResult(), QVector<int>({0, 0}));
+    QCOMPARE(signalResult(), QList<int>({0, 0}));
     QCOMPARE(findTextSync(m_page, ""), false);
-    QCOMPARE(signalResult(), QVector<int>({0, 0}));
+    QCOMPARE(signalResult(), QList<int>({0, 0}));
 }
 
 void tst_QWebEnginePage::findTextSuccessiveShouldCallAllCallbacks()
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 00d4bae5a..908b38202 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -872,7 +872,7 @@ void tst_QWebEngineProfile::changeHttpUserAgent()
     TestServer server;
     QVERIFY(server.start());
 
-    QVector<QByteArray> userAgents;
+    QList<QByteArray> userAgents;
     connect(&server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
         if (rr->requestPath() == "/hedgehog.html")
             userAgents.push_back(rr->requestHeader(QByteArrayLiteral("user-agent")));
@@ -899,7 +899,7 @@ void tst_QWebEngineProfile::changeHttpAcceptLanguage()
     TestServer server;
     QVERIFY(server.start());
 
-    QVector<QByteArray> languages;
+    QList<QByteArray> languages;
     connect(&server, &HttpServer::newRequest, [&](HttpReqRep *rr) {
         if (rr->requestPath() == "/hedgehog.html")
             languages.push_back(rr->requestHeader(QByteArrayLiteral("accept-language")));
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index c5d3f2eed..502729228 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -961,7 +961,7 @@ public:
 
 private:
     int m_eventCounter;
-    QVector<QString> m_eventHistory;
+    QList<QString> m_eventHistory;
 };
 
 void tst_QWebEngineView::doNotSendMouseKeyboardEventsWhenDisabled()
diff --git a/tests/auto/widgets/util.h b/tests/auto/widgets/util.h
index cb58f4243..a47532806 100644
--- a/tests/auto/widgets/util.h
+++ b/tests/auto/widgets/util.h
@@ -178,7 +178,7 @@ static inline bool loadSync(QWebEngineView *view, const QUrl &url, bool ok = tru
 #define W_QTEST_MAIN(TestObject, params) \
 int main(int argc, char *argv[]) \
 { \
-    QVector<const char *> w_argv(argc); \
+    QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
         w_argv[i] = argv[i]; \
     for (int i = 0; i < params.size(); ++i) \
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index ba0367aaa..5808fe167 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
             << QByteArrayLiteral("--enable-embedded-switches")
             << QByteArrayLiteral("--log-level=0");
     const int count = args.size() + argc;
-    QVector<char*> qargv(count);
+    QList<char*> qargv(count);
 
     qargv[0] = argv[0];
     for (int i = 0; i < args.size(); ++i)