From b0f9c06a9b199a7474eb94a6292b5824364344b6 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 26 Jun 2020 08:21:15 +0200
Subject: Use QList instead of QVector in corelib implementation

Omitting state machine and docs for now.

Task-number: QTBUG-84469
Change-Id: Ibfa5e7035515773461f6cdbff35299315ef65737
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 src/corelib/plugin/qfactoryloader.cpp | 2 +-
 src/corelib/plugin/qlibrary.cpp       | 2 +-
 src/corelib/plugin/qpluginloader.cpp  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/corelib/plugin')

diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 32b07a5636..8b87baaff9 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -404,7 +404,7 @@ QObject *QFactoryLoader::instance(int index) const
     lock.unlock();
 #endif
 
-    QVector<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins();
+    QList<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins();
     for (int i = 0; i < staticPlugins.count(); ++i) {
         const QJsonObject object = staticPlugins.at(i).metaData();
         if (object.value(QLatin1String("IID")) != QLatin1String(d->iid.constData(), d->iid.size()))
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index b66eb3e993..9ea8e2793c 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -56,7 +56,7 @@
 #include <errno.h>
 #endif // NO_ERROR_H
 #include <qdebug.h>
-#include <qvector.h>
+#include <qlist.h>
 #include <qdir.h>
 #include <qendian.h>
 #include <qjsondocument.h>
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 2ae6913868..b8de3690d9 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -427,7 +427,7 @@ QLibrary::LoadHints QPluginLoader::loadHints() const
 
 #endif // QT_CONFIG(library)
 
-typedef QVector<QStaticPlugin> StaticPluginList;
+typedef QList<QStaticPlugin> StaticPluginList;
 Q_GLOBAL_STATIC(StaticPluginList, staticPluginList)
 
 /*!
@@ -467,12 +467,12 @@ QObjectList QPluginLoader::staticInstances()
     meta data information.
     \sa staticInstances()
 */
-QVector<QStaticPlugin> QPluginLoader::staticPlugins()
+QList<QStaticPlugin> QPluginLoader::staticPlugins()
 {
     StaticPluginList *plugins = staticPluginList();
     if (plugins)
         return *plugins;
-    return QVector<QStaticPlugin>();
+    return QList<QStaticPlugin>();
 }
 
 /*!
-- 
cgit v1.2.3