10 files changed, 12 insertions, 23 deletions
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index e8933b4526..bac362dc80 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -731,14 +731,6 @@ QDebug &QDebug::resetFormat()
 */
 
 /*!
-    \fn template <typename T> QDebug operator<<(QDebug debug, const QVector<T> &vec)
-    \relates QDebug
-
-    Writes the contents of vector \a vec to \a debug. \c T needs to
-    support streaming into QDebug.
-*/
-
-/*!
     \fn template <typename T, typename Alloc> QDebug operator<<(QDebug debug, const std::vector<T, Alloc> &vec)
     \relates QDebug
     \since 5.7
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 026e93b418..8bf87eacae 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -51,7 +51,6 @@
 #if QT_CONFIG(regularexpression)
 #  include <qregularexpression.h>
 #endif
-#include "qvector.h"
 #include "qvarlengtharray.h"
 #include "qfilesystementry_p.h"
 #include "qfilesystemmetadata_p.h"
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index 0c60ca8920..4486a92741 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -142,7 +142,7 @@ public:
     const QDirIterator::IteratorFlags iteratorFlags;
 
 #if QT_CONFIG(regularexpression)
-    QVector<QRegularExpression> nameRegExps;
+    QList<QRegularExpression> nameRegExps;
 #endif
 
     QDirIteratorPrivateIteratorStack<QAbstractFileEngineIterator> fileEngineIterators;
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index 6e5e19e12f..e91a7558d7 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -47,12 +47,11 @@
 #include <private/qsystemlibrary_p.h>
 #include <qdebug.h>
 
-#include "qfile.h"
 #include "qdir.h"
-#include "qvarlengtharray.h"
 #include "qdatetime.h"
+#include "qfile.h"
+#include "qvarlengtharray.h"
 #include "qt_windows.h"
-#include "qvector.h"
 #if QT_CONFIG(regularexpression)
 #include "qregularexpression.h"
 #endif
diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp
index a680964129..65596643bc 100644
--- a/src/corelib/io/qfilesystemiterator_win.cpp
+++ b/src/corelib/io/qfilesystemiterator_win.cpp
@@ -41,7 +41,6 @@
 #include "qfilesystemengine_p.h"
 #include "qoperatingsystemversion.h"
 #include "qplatformdefs.h"
-#include "qvector.h"
 
 #include <QtCore/qt_windows.h>
 
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index cc04288de5..9544dd7a04 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -648,7 +648,7 @@ void QWindowsFileSystemWatcherEngineThread::run()
 {
     auto locker = qt_unique_lock(mutex);
     forever {
-        QVector<HANDLE> handlesCopy = handles;
+        QList<HANDLE> handlesCopy = handles;
         locker.unlock();
         DEBUG() << "QWindowsFileSystemWatcherThread" << this << "waiting on" << handlesCopy.count() << "handles";
         DWORD r = WaitForMultipleObjects(handlesCopy.count(), handlesCopy.constData(), false, INFINITE);
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index d40f312fc4..e2a866372c 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -283,7 +283,7 @@ static bool qtLoggingDebug()
     return debugEnv;
 }
 
-static QVector<QLoggingRule> loadRulesFromFile(const QString &filePath)
+static QList<QLoggingRule> loadRulesFromFile(const QString &filePath)
 {
     QFile file(filePath);
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -295,7 +295,7 @@ static QVector<QLoggingRule> loadRulesFromFile(const QString &filePath)
         parser.setContent(stream);
         return parser.rules();
     }
-    return QVector<QLoggingRule>();
+    return QList<QLoggingRule>();
 }
 
 /*!
@@ -305,7 +305,7 @@ static QVector<QLoggingRule> loadRulesFromFile(const QString &filePath)
  */
 void QLoggingRegistry::initializeRules()
 {
-    QVector<QLoggingRule> er, qr, cr;
+    QList<QLoggingRule> er, qr, cr;
     // get rules from environment
     const QByteArray rulesFilePath = qgetenv("QT_LOGGING_CONF");
     if (!rulesFilePath.isEmpty())
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 9324261939..5c5a796278 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -46,7 +46,7 @@
 #include "qdebug.h"
 #include "qlocale.h"
 #include "qglobal.h"
-#include "qvector.h"
+#include "qlist.h"
 #include "qdatetime.h"
 #include "qbytearray.h"
 #include "qstringlist.h"
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 5d84713a67..b9bb237544 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -124,7 +124,7 @@ namespace {
     };
 }
 typedef QHash<int, Path> PathHash;
-typedef QVector<QConfFileCustomFormat> CustomFormatVector;
+typedef QList<QConfFileCustomFormat> CustomFormatVector;
 
 Q_GLOBAL_STATIC(ConfFileHash, usedHashFunc)
 Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)
@@ -1772,7 +1772,7 @@ bool QConfFileSettingsPrivate::writeIniFile(QIODevice &device, const ParsedSetti
     }
 
     const int sectionCount = iniMap.size();
-    QVector<QSettingsIniKey> sections;
+    QList<QSettingsIniKey> sections;
     sections.reserve(sectionCount);
     for (i = iniMap.constBegin(); i != iniMap.constEnd(); ++i)
         sections.append(QSettingsIniKey(i.key(), i.value().position));
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp
index 7a4c1b5f02..b2167aa2bc 100644
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@@ -40,7 +40,7 @@
 #include "qsettings.h"
 
 #include "qsettings_p.h"
-#include "qvector.h"
+#include "qlist.h"
 #include "qmap.h"
 #include "qdebug.h"
 #include <qt_windows.h>
@@ -369,7 +369,7 @@ void RegistryKey::close()
     m_handle = 0;
 }
 
-typedef QVector<RegistryKey> RegistryKeyList;
+typedef QList<RegistryKey> RegistryKeyList;
 
 /*******************************************************************************
 ** class QWinSettingsPrivate