Use QList instead of QVector in gui

Applied to headers only. Source file to be changed separately.

Task-number: QTBUG-84469
Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

22 files changed, 146 insertions, 135 deletions

diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h
index 397dcd37d4..4dd3e16160 100644
--- a/src/gui/text/qabstracttextdocumentlayout.h
+++ b/src/gui/text/qabstracttextdocumentlayout.h
@@ -78,7 +78,7 @@ public:
         int cursorPosition;
         QPalette palette;
         QRectF clip;
-        QVector<Selection> selections;
+        QList<Selection> selections;
     };
 
     virtual void draw(QPainter *painter, const PaintContext &context) = 0;
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index ef5ae8c80b..f340a23cde 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -53,7 +53,7 @@
 
 #include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <QtCore/QPair>
 #include <QtCore/QSize>
@@ -432,11 +432,10 @@ struct BorderData {
 };
 QT_CSS_DECLARE_TYPEINFO(BorderData, Q_MOVABLE_TYPE)
 
-
 // 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; }
-// 2. QVector<Selector> - x:hover, y:clicked z:checked
-// 3. QVector<BasicSelector> - y:clicked z:checked
-// 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
+// 2. QList<Selector> - x:hover, y:clicked z:checked
+// 3. QList<BasicSelector> - y:clicked z:checked
+// 4. QList<Declaration> - { prop1: value1; prop2: value2; }
 // 5. Declaration - prop1: value1;
 
 struct Q_GUI_EXPORT Declaration
@@ -446,7 +445,7 @@ struct Q_GUI_EXPORT Declaration
         inline DeclarationData() : propertyId(UnknownProperty), important(false), inheritable(false) {}
         QString property;
         Property propertyId;
-        QVector<Value> values;
+        QList<Value> values;
         QVariant parsed;
         bool important:1;
         bool inheritable:1;
@@ -578,8 +577,8 @@ struct BasicSelector
     QString elementName;
 
     QStringList ids;
-    QVector<Pseudo> pseudos;
-    QVector<AttributeSelector> attributeSelectors;
+    QList<Pseudo> pseudos;
+    QList<AttributeSelector> attributeSelectors;
 
     Relation relationToNext;
 };
@@ -587,7 +586,7 @@ QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_MOVABLE_TYPE)
 
 struct Q_GUI_EXPORT Selector
 {
-    QVector<BasicSelector> basicSelectors;
+    QList<BasicSelector> basicSelectors;
     int specificity() const;
     quint64 pseudoClass(quint64 *negated = nullptr) const;
     QString pseudoElement() const;
@@ -597,8 +596,8 @@ QT_CSS_DECLARE_TYPEINFO(Selector, Q_MOVABLE_TYPE)
 struct StyleRule
 {
     StyleRule() : order(0) { }
-    QVector<Selector> selectors;
-    QVector<Declaration> declarations;
+    QList<Selector> selectors;
+    QList<Declaration> declarations;
     int order;
 };
 QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE)
@@ -606,14 +605,14 @@ QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE)
 struct MediaRule
 {
     QStringList media;
-    QVector<StyleRule> styleRules;
+    QList<StyleRule> styleRules;
 };
 QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_MOVABLE_TYPE)
 
 struct PageRule
 {
     QString selector;
-    QVector<Declaration> declarations;
+    QList<Declaration> declarations;
 };
 QT_CSS_DECLARE_TYPEINFO(PageRule, Q_MOVABLE_TYPE)
 
@@ -635,10 +634,10 @@ enum StyleSheetOrigin {
 struct StyleSheet
 {
     StyleSheet() : origin(StyleSheetOrigin_Unspecified), depth(0) { }
-    QVector<StyleRule> styleRules;  //only contains rules that are not indexed
-    QVector<MediaRule> mediaRules;
-    QVector<PageRule> pageRules;
-    QVector<ImportRule> importRules;
+    QList<StyleRule> styleRules; // only contains rules that are not indexed
+    QList<MediaRule> mediaRules;
+    QList<PageRule> pageRules;
+    QList<ImportRule> importRules;
     StyleSheetOrigin origin;
     int depth; // applicable only for inline style sheets
     QMultiHash<QString, StyleRule> nameIndex;
@@ -660,8 +659,8 @@ public:
         int id;
     };
 
-    QVector<StyleRule> styleRulesForNode(NodePtr node);
-    QVector<Declaration> declarationsForNode(NodePtr node, const char *extraPseudo = nullptr);
+    QList<StyleRule> styleRulesForNode(NodePtr node);
+    QList<Declaration> declarationsForNode(NodePtr node, const char *extraPseudo = nullptr);
 
     virtual bool nodeNameEquals(NodePtr node, const QString& nodeName) const;
     virtual QString attribute(NodePtr node, const QString &name) const = 0;
@@ -674,7 +673,7 @@ public:
     virtual NodePtr duplicateNode(NodePtr node) const = 0;
     virtual void freeNode(NodePtr node) const = 0;
 
-    QVector<StyleSheet> styleSheets;
+    QList<StyleSheet> styleSheets;
     QString medium;
     Qt::CaseSensitivity nameCaseSensitivity;
 private:
@@ -750,7 +749,7 @@ class Q_GUI_EXPORT Scanner
 {
 public:
     static QString preprocess(const QString &input, bool *hasEscapeSequences = nullptr);
-    static void scan(const QString &preprocessedInput, QVector<Symbol> *symbols);
+    static void scan(const QString &preprocessedInput, QList<Symbol> *symbols);
 };
 
 class Q_GUI_EXPORT Parser
@@ -780,7 +779,7 @@ public:
     bool parsePseudo(Pseudo *pseudo);
     bool parseNextDeclaration(Declaration *declaration);
     bool parsePrio(Declaration *declaration);
-    bool parseExpr(QVector<Value> *values);
+    bool parseExpr(QList<Value> *values);
     bool parseTerm(Value *value);
     bool parseFunction(QString *name, QString *args);
     bool parseHexColor(QColor *col);
@@ -805,7 +804,12 @@ public:
     inline bool testProperty() { return test(IDENT); }
     bool testTerm();
     inline bool testExpr() { return testTerm(); }
-    inline bool parseNextExpr(QVector<Value> *values) { if (!testExpr()) return recordError(); return parseExpr(values); }
+    inline bool parseNextExpr(QList<Value> *values)
+    {
+        if (!testExpr())
+            return recordError();
+        return parseExpr(values);
+    }
     bool testPrio();
     inline bool testHexColor() { return test(HASH); }
     inline bool testFunction() { return test(FUNCTION); }
@@ -833,7 +837,7 @@ public:
 
     inline bool recordError() { errorIndex = index; return false; }
 
-    QVector<Symbol> symbols;
+    QList<Symbol> symbols;
     int index;
     int errorIndex;
     bool hasEscapeSequences;
@@ -842,7 +846,7 @@ public:
 
 struct Q_GUI_EXPORT ValueExtractor
 {
-    ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
+    ValueExtractor(const QList<Declaration> &declarations, const QPalette & = QPalette());
 
     bool extractFont(QFont *font, int *fontSizeAdjustment);
     bool extractBackground(QBrush *, QString *, Repeat *, Qt::Alignment *, QCss::Origin *, QCss::Attachment *,
@@ -868,7 +872,7 @@ private:
     QSize sizeValue(const Declaration &decl);
     void sizeValues(const Declaration &decl, QSize *radii);
 
-    QVector<Declaration> declarations;
+    QList<Declaration> declarations;
     QFont f;
     int adjustment;
     int fontExtracted;
diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h
index 48b4fe8603..fba40e9133 100644
--- a/src/gui/text/qfontdatabase_p.h
+++ b/src/gui/text/qfontdatabase_p.h
@@ -262,9 +262,9 @@ public:
             int stretch = QFont::Unstretched;
         };
 
-        QVector<Properties> properties;
+        QList<Properties> properties;
     };
-    QVector<ApplicationFont> applicationFonts;
+    QList<ApplicationFont> applicationFonts;
     int addAppFont(const QByteArray &fontData, const QString &fileName);
     bool isApplicationFont(const QString &fileName);
 
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 58a810e856..524eaf32a7 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -353,7 +353,7 @@ public:
             return left_right < other.left_right;
         }
     };
-    QVector<KernPair> kerning_pairs;
+    QList<KernPair> kerning_pairs;
     void loadKerningPairs(QFixed scalingFactor);
 
     GlyphFormat glyphFormat;
@@ -513,7 +513,7 @@ protected:
     virtual QFontEngine *loadEngine(int at);
 
 private:
-    QVector<QFontEngine *> m_engines;
+    QList<QFontEngine *> m_engines;
     QStringList m_fallbackFamilies;
     const int m_script;
     bool m_fallbackFamiliesQueried;
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h
index e7c6053beb..1a3b392601 100644
--- a/src/gui/text/qfontsubset_p.h
+++ b/src/gui/text/qfontsubset_p.h
@@ -76,8 +76,8 @@ public:
 #ifndef QT_NO_PDF
     QByteArray widthArray() const;
     QByteArray createToUnicodeMap() const;
-    QVector<int> getReverseMap() const;
-    QByteArray glyphName(unsigned int glyph, const QVector<int> &reverseMap) const;
+    QList<int> getReverseMap() const;
+    QByteArray glyphName(unsigned int glyph, const QList<int> &reverseMap) const;
 
     static QByteArray glyphName(unsigned short unicode, bool symbol);
 
@@ -86,12 +86,12 @@ public:
     const int object_id;
     bool noEmbed;
     QFontEngine *fontEngine;
-    QVector<int> glyph_indices;
+    QList<int> glyph_indices;
     mutable int downloaded_glyphs;
     mutable bool standard_font;
     int nGlyphs() const { return glyph_indices.size(); }
     mutable QFixed emSquare;
-    mutable QVector<QFixed> widths;
+    mutable QList<QFixed> widths;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index 15e315bea2..0da8eddda8 100644
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -41,9 +41,9 @@
 #define QGLYPHRUN_H
 
 #include <QtGui/qtguiglobal.h>
-#include <QtCore/qsharedpointer.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qpoint.h>
+#include <QtCore/qsharedpointer.h>
 #include <QtGui/qrawfont.h>
 
 #if !defined(QT_NO_RAWFONT)
@@ -79,11 +79,11 @@ public:
                     const QPointF *glyphPositionArray,
                     int size);
 
-    QVector<quint32> glyphIndexes() const;
-    void setGlyphIndexes(const QVector<quint32> &glyphIndexes);
+    QList<quint32> glyphIndexes() const;
+    void setGlyphIndexes(const QList<quint32> &glyphIndexes);
 
-    QVector<QPointF> positions() const;
-    void setPositions(const QVector<QPointF> &positions);
+    QList<QPointF> positions() const;
+    void setPositions(const QList<QPointF> &positions);
 
     void clear();
 
diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h
index 46e2a8bbfb..77943fc0c0 100644
--- a/src/gui/text/qglyphrun_p.h
+++ b/src/gui/text/qglyphrun_p.h
@@ -90,8 +90,8 @@ public:
     {
     }
 
-    QVector<quint32> glyphIndexes;
-    QVector<QPointF> glyphPositions;
+    QList<quint32> glyphIndexes;
+    QList<QPointF> glyphPositions;
     QRawFont rawFont;
     QRectF boundingRect;
 
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index 823c92b050..e7e12df040 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -97,9 +97,10 @@ public:
     QFont::Style style() const;
     int weight() const;
 
-    QVector<quint32> glyphIndexesForString(const QString &text) const;
-    inline QVector<QPointF> advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const;
-    inline QVector<QPointF> advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, LayoutFlags layoutFlags) const;
+    QList<quint32> glyphIndexesForString(const QString &text) const;
+    inline QList<QPointF> advancesForGlyphIndexes(const QList<quint32> &glyphIndexes) const;
+    inline QList<QPointF> advancesForGlyphIndexes(const QList<quint32> &glyphIndexes,
+                                                  LayoutFlags layoutFlags) const;
     bool glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const;
     bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const;
     bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs, LayoutFlags layoutFlags) const;
@@ -158,15 +159,16 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QRawFont::LayoutFlags)
 
 Q_GUI_EXPORT size_t qHash(const QRawFont &font, size_t seed = 0) noexcept;
 
-inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, QRawFont::LayoutFlags layoutFlags) const
+inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &glyphIndexes,
+                                                        QRawFont::LayoutFlags layoutFlags) const
 {
-    QVector<QPointF> advances(glyphIndexes.size());
+    QList<QPointF> advances(glyphIndexes.size());
     if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), glyphIndexes.size(), layoutFlags))
         return advances;
-    return QVector<QPointF>();
+    return QList<QPointF>();
 }
 
-inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const
+inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &glyphIndexes) const
 {
     return advancesForGlyphIndexes(glyphIndexes, QRawFont::SeparateAdvances);
 }
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 2b4cf5df6f..5de81e683c 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -230,7 +230,7 @@ public:
     QVariant resource(int type, const QUrl &name) const;
     void addResource(int type, const QUrl &name, const QVariant &resource);
 
-    QVector<QTextFormat> allFormats() const;
+    QList<QTextFormat> allFormats() const;
 
     void markContentsDirty(int from, int length);
 
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index 4c07bcac72..2154086409 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -52,22 +52,23 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include "QtCore/qstring.h"
-#include "QtCore/qvector.h"
-#include "QtCore/qlist.h"
-#include "private/qobject_p.h"
-#include "private/qfragmentmap_p.h"
-#include "QtGui/qtextlayout.h"
-#include "QtGui/qtextoption.h"
-#include "private/qtextformat_p.h"
+#include "QtGui/qtextcursor.h"
 #include "QtGui/qtextdocument.h"
+#include "QtGui/qtextlayout.h"
 #include "QtGui/qtextobject.h"
-#include "QtGui/qtextcursor.h"
+#include "QtGui/qtextoption.h"
+
+#include "QtCore/qlist.h"
 #include "QtCore/qmap.h"
-#include "QtCore/qvariant.h"
 #include "QtCore/qset.h"
+#include "QtCore/qstring.h"
 #include "QtCore/qurl.h"
+#include "QtCore/qvariant.h"
+
 #include "private/qcssparser_p.h"
+#include "private/qfragmentmap_p.h"
+#include "private/qobject_p.h"
+#include "private/qtextformat_p.h"
 
 // #define QT_QMAP_DEBUG
 
@@ -339,7 +340,7 @@ private:
     QString text;
     uint unreachableCharacterCount;
 
-    QVector<QTextUndoCommand> undoStack;
+    QList<QTextUndoCommand> undoStack;
     bool undoEnabled;
     int undoState;
     int revision;
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
index 67b0c2c600..3683cd8d4f 100644
--- a/src/gui/text/qtextdocumentfragment_p.h
+++ b/src/gui/text/qtextdocumentfragment_p.h
@@ -150,7 +150,7 @@ private:
         QPointer<QTextList> list;
     };
     friend class QTypeInfo<List>;
-    QVector<List> lists;
+    QList<List> lists;
     int indent;
     int headingLevel;
 
@@ -205,7 +205,7 @@ private:
         int lastIndent;
     };
     friend class QTypeInfo<Table>;
-    QVector<Table> tables;
+    QList<Table> tables;
 
     struct RowColSpanInfo
     {
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 4d8112c679..61c47c5e83 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -52,27 +52,27 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include "QtCore/qstring.h"
-#include "QtCore/qvarlengtharray.h"
-#include "QtCore/qnamespace.h"
-#include "QtGui/qtextlayout.h"
-#include "private/qtextformat_p.h"
-#include "private/qfont_p.h"
-#include "QtCore/qvector.h"
 #include "QtGui/qpaintengine.h"
+#include "QtGui/qtextcursor.h"
 #include "QtGui/qtextobject.h"
 #include "QtGui/qtextoption.h"
-#include "QtGui/qtextcursor.h"
-#include "QtCore/qset.h"
+#include "QtGui/qtextlayout.h"
+
 #include "QtCore/qdebug.h"
+#include "QtCore/qlist.h"
+#include "QtCore/qnamespace.h"
+#include "QtCore/qset.h"
+#include "QtCore/qstring.h"
+#include "QtCore/qvarlengtharray.h"
+
+#include "private/qfixed_p.h"
+#include "private/qfont_p.h"
+#include "private/qtextformat_p.h"
+#include "private/qunicodetools_p.h"
 #ifndef QT_BUILD_COMPAT_LIB
 #include "private/qtextdocument_p.h"
 #endif
 
-#include "private/qfixed_p.h"
-
-#include <private/qunicodetools_p.h>
-
 #include <stdlib.h>
 #include <vector>
 
@@ -394,7 +394,7 @@ inline void QScriptLine::operator+=(const QScriptLine &other)
     length += other.length;
 }
 
-typedef QVector<QScriptLine> QScriptLineArray;
+typedef QList<QScriptLine> QScriptLineArray;
 
 class QFontPrivate;
 class QTextFormatCollection;
@@ -426,7 +426,7 @@ public:
     };
 
     struct ItemDecoration {
-        ItemDecoration() {} // for QVector, don't use
+        ItemDecoration() { } // for QList, don't use
         ItemDecoration(qreal x1, qreal x2, qreal y, const QPen &pen):
             x1(x1), x2(x2), y(y), pen(pen) {}
 
@@ -436,7 +436,7 @@ public:
         QPen pen;
     };
 
-    typedef QVector<ItemDecoration> ItemDecorationList;
+    typedef QList<ItemDecoration> ItemDecorationList;
 
     QTextEngine();
     QTextEngine(const QString &str, const QFont &f);
@@ -597,9 +597,11 @@ public:
 
     inline bool hasFormats() const
     { return QTextDocumentPrivate::get(block) != nullptr || (specialData && !specialData->formats.isEmpty()); }
-    inline QVector<QTextLayout::FormatRange> formats() const
-    { return specialData ? specialData->formats : QVector<QTextLayout::FormatRange>(); }
-    void setFormats(const QVector<QTextLayout::FormatRange> &formats);
+    inline QList<QTextLayout::FormatRange> formats() const
+    {
+        return specialData ? specialData->formats : QList<QTextLayout::FormatRange>();
+    }
+    void setFormats(const QList<QTextLayout::FormatRange> &formats);
 
 private:
     static void init(QTextEngine *e);
@@ -607,8 +609,8 @@ private:
     struct SpecialData {
         int preeditPosition;
         QString preeditText;
-        QVector<QTextLayout::FormatRange> formats;
-        QVector<QTextCharFormat> resolvedFormats;
+        QList<QTextLayout::FormatRange> formats;
+        QList<QTextCharFormat> resolvedFormats;
         // only used when no QTextDocumentPrivate is available
         QScopedPointer<QTextFormatCollection> formatCollection;
     };
@@ -654,13 +656,9 @@ private:
     void addRequiredBoundaries() const;
     void shapeText(int item) const;
 #if QT_CONFIG(harfbuzz)
-    int shapeTextWithHarfbuzzNG(const QScriptItem &si,
-                                const ushort *string,
-                                int itemLength,
-                                QFontEngine *fontEngine,
-                                const QVector<uint> &itemBoundaries,
-                                bool kerningEnabled,
-                                bool hasLetterSpacing) const;
+    int shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *string, int itemLength,
+                                QFontEngine *fontEngine, const QList<uint> &itemBoundaries,
+                                bool kerningEnabled, bool hasLetterSpacing) const;
 #endif
 
     int endOfLine(int lineNum);
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index a6d1bf1d57..e12f033596 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -40,15 +40,16 @@
 #ifndef QTEXTFORMAT_H
 #define QTEXTFORMAT_H
 
-#include <QtGui/qtguiglobal.h>
+#include <QtGui/qbrush.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qfont.h>
-#include <QtCore/qshareddata.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qvariant.h>
 #include <QtGui/qpen.h>
-#include <QtGui/qbrush.h>
 #include <QtGui/qtextoption.h>
+#include <QtGui/qtguiglobal.h>
+
+#include <QtCore/qlist.h>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -351,9 +352,9 @@ public:
     QPen penProperty(int propertyId) const;
     QBrush brushProperty(int propertyId) const;
     QTextLength lengthProperty(int propertyId) const;
-    QVector<QTextLength> lengthVectorProperty(int propertyId) const;
+    QList<QTextLength> lengthVectorProperty(int propertyId) const;
 
-    void setProperty(int propertyId, const QVector<QTextLength> &lengths);
+    void setProperty(int propertyId, const QList<QTextLength> &lengths);
 
     QMap<int, QVariant> properties() const;
     int propertyCount() const;
@@ -952,10 +953,10 @@ public:
     { int cols = intProperty(TableColumns); if (cols == 0) cols = 1; return cols; }
     inline void setColumns(int columns);
 
-    inline void setColumnWidthConstraints(const QVector<QTextLength> &constraints)
+    inline void setColumnWidthConstraints(const QList<QTextLength> &constraints)
     { setProperty(TableColumnWidthConstraints, constraints); }
 
-    inline QVector<QTextLength> columnWidthConstraints() const
+    inline QList<QTextLength> columnWidthConstraints() const
     { return lengthVectorProperty(TableColumnWidthConstraints); }
 
     inline void clearColumnWidthConstraints()
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h
index c9a3c8f8ee..862ef18e65 100644
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@@ -53,7 +53,7 @@
 
 #include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qtextformat.h"
-#include "QtCore/qvector.h"
+#include "QtCore/qlist.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -92,10 +92,10 @@ public:
 
     inline int numFormats() const { return formats.count(); }
 
-    typedef QVector<QTextFormat> FormatVector;
+    typedef QList<QTextFormat> FormatVector;
 
     FormatVector formats;
-    QVector<qint32> objFormats;
+    QList<qint32> objFormats;
     QMultiHash<size_t,int> hashes;
 
     inline QFont defaultFont() const { return defaultFnt; }
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 31f558709f..4bfdab124b 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -52,12 +52,14 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include "QtCore/qvector.h"
 #include "QtGui/qbrush.h"
 #include "QtGui/qcolor.h"
 #include "QtGui/qfont.h"
 #include "QtGui/qtextdocument.h"
 #include "QtGui/qtextcursor.h"
+
+#include "QtCore/qlist.h"
+
 #include "private/qtextformat_p.h"
 #include "private/qtextdocument_p.h"
 #include "private/qcssparser_p.h"
@@ -167,7 +169,7 @@ struct QTextHtmlParserNode {
     QString text;
     QStringList attributes;
     int parent;
-    QVector<int> children;
+    QList<int> children;
     QTextHTMLElements id;
     QTextCharFormat charFormat;
     QTextBlockFormat blockFormat;
@@ -251,10 +253,11 @@ struct QTextHtmlParserNode {
     void parseStyleAttribute(const QString &value, const QTextDocument *resourceProvider);
 
 #if QT_CONFIG(cssparser)
-    void applyCssDeclarations(const QVector<QCss::Declaration> &declarations, const QTextDocument *resourceProvider);
+    void applyCssDeclarations(const QList<QCss::Declaration> &declarations,
+                              const QTextDocument *resourceProvider);
 
-    void setListStyle(const QVector<QCss::Value> &cssValues);
-#endif
+    void setListStyle(const QList<QCss::Value> &cssValues);
+#    endif
 
     void applyForegroundImage(qint64 cacheKey, const QTextDocument *resourceProvider);
     void applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider);
@@ -305,7 +308,7 @@ public:
     static int lookupElement(const QString &element);
 protected:
     QTextHtmlParserNode *newNode(int parent);
-    QVector<QTextHtmlParserNode> nodes;
+    QList<QTextHtmlParserNode> nodes;
     QString txt;
     int pos, len;
 
@@ -330,7 +333,7 @@ protected:
 
 
 #if QT_CONFIG(cssparser)
-    QVector<QCss::Declaration> declarationsForNode(int node) const;
+    QList<QCss::Declaration> declarationsForNode(int node) const;
     void resolveStyleSheetImports(const QCss::StyleSheet &sheet);
     void importStyleSheet(const QString &href);
 
@@ -343,9 +346,9 @@ protected:
         QCss::StyleSheet sheet;
     };
     friend class QTypeInfo<ExternalStyleSheet>;
-    QVector<ExternalStyleSheet> externalStyleSheets;
-    QVector<QCss::StyleSheet> inlineStyleSheets;
-#endif
+    QList<ExternalStyleSheet> externalStyleSheets;
+    QList<QCss::StyleSheet> inlineStyleSheets;
+#    endif
 
     const QTextDocument *resourceProvider;
 };
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 2fc0fcd55a..0fc41802de 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -39,17 +39,18 @@
 #ifndef QTEXTLAYOUT_H
 #define QTEXTLAYOUT_H
 
-#include <QtGui/qtguiglobal.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qnamespace.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qvector.h>
 #include <QtGui/qcolor.h>
-#include <QtCore/qobject.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qtextformat.h>
 #include <QtGui/qglyphrun.h>
 #include <QtGui/qtextcursor.h>
+#include <QtGui/qtextformat.h>
+#include <QtGui/qtguiglobal.h>
+
+#include <QtCore/qlist.h>
+#include <QtCore/qnamespace.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -155,8 +156,8 @@ public:
     QT_DEPRECATED_X("Use formats()") QList<FormatRange> additionalFormats() const;
     QT_DEPRECATED_X("Use clearFormats()") void clearAdditionalFormats();
 #endif
-    void setFormats(const QVector<FormatRange> &overrides);
-    QVector<FormatRange> formats() const;
+    void setFormats(const QList<FormatRange> &overrides);
+    QList<FormatRange> formats() const;
     void clearFormats();
 
     void setCacheEnabled(bool enable);
@@ -185,7 +186,8 @@ public:
     int leftCursorPosition(int oldPos) const;
     int rightCursorPosition(int oldPos) const;
 
-    void draw(QPainter *p, const QPointF &pos, const QVector<FormatRange> &selections = QVector<FormatRange>(),
+    void draw(QPainter *p, const QPointF &pos,
+              const QList<FormatRange> &selections = QList<FormatRange>(),
               const QRectF &clip = QRectF()) const;
     void drawCursor(QPainter *p, const QPointF &pos, int cursorPosition) const;
     void drawCursor(QPainter *p, const QPointF &pos, int cursorPosition, int width) const;
diff --git a/src/gui/text/qtextmarkdownimporter_p.h b/src/gui/text/qtextmarkdownimporter_p.h
index f12b725d8e..c05ac68820 100644
--- a/src/gui/text/qtextmarkdownimporter_p.h
+++ b/src/gui/text/qtextmarkdownimporter_p.h
@@ -113,7 +113,7 @@ private:
     QString m_htmlAccumulator;
 #endif
     QString m_blockCodeLanguage;
-    QVector<int> m_nonEmptyTableCells; // in the current row
+    QList<int> m_nonEmptyTableCells; // in the current row
     QStack<QPointer<QTextList>> m_listStack;
     QStack<QTextCharFormat> m_spanFormatStack;
     QFont m_monoFont;
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index ac82eb13d7..1d4448029d 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -217,7 +217,7 @@ public:
 
     QString text() const;
 
-    QVector<QTextLayout::FormatRange> textFormats() const;
+    QList<QTextLayout::FormatRange> textFormats() const;
 
     const QTextDocument *document() const;
 
diff --git a/src/gui/text/qtextodfwriter_p.h b/src/gui/text/qtextodfwriter_p.h
index 53d9084d80..2c41dfba67 100644
--- a/src/gui/text/qtextodfwriter_p.h
+++ b/src/gui/text/qtextodfwriter_p.h
@@ -55,11 +55,11 @@
 // We mean it.
 //
 
-#include <QtCore/QXmlStreamWriter>
 #include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
-#include <QtCore/qvector.h>
+#include <QtCore/QXmlStreamWriter>
 
 #include "qtextdocument_p.h"
 #include "qtextdocumentwriter.h"
@@ -96,8 +96,8 @@ public:
     void writeListFormat(QXmlStreamWriter &writer, QTextListFormat format, int formatIndex) const;
     void writeFrameFormat(QXmlStreamWriter &writer, QTextFrameFormat format, int formatIndex) const;
     void writeTableFormat(QXmlStreamWriter &writer, QTextTableFormat format, int formatIndex) const;
-    void writeTableCellFormat(QXmlStreamWriter &writer, QTextTableCellFormat format, int formatIndex,
-                              QVector<QTextFormat> &styles) const;
+    void writeTableCellFormat(QXmlStreamWriter &writer, QTextTableCellFormat format,
+                              int formatIndex, QList<QTextFormat> &styles) const;
     void writeFrame(QXmlStreamWriter &writer, const QTextFrame *frame);
     void writeInlineCharacter(QXmlStreamWriter &writer, const QTextFragment &fragment) const;
 
@@ -119,7 +119,7 @@ private:
 
     QStack<QTextList *> m_listStack;
 
-    QHash<int, QVector<int>> m_cellFormatsInTablesWithBorders;
+    QHash<int, QList<int>> m_cellFormatsInTablesWithBorders;
     QSet<int> m_tableFormatsWithBorders;
     mutable QSet<int> m_tableFormatsWithColWidthConstraints;
 };
diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h
index 5c05611009..7dcab6c147 100644
--- a/src/gui/text/qtexttable_p.h
+++ b/src/gui/text/qtexttable_p.h
@@ -72,10 +72,10 @@ public:
 
     int findCellIndex(int fragment) const;
 
-    QVector<int> cells;
+    QList<int> cells;
     // symmetric to cells array and maps to indecs in grid,
     // used for fast-lookup for row/column by fragment
-    mutable QVector<int> cellIndices;
+    mutable QList<int> cellIndices;
     mutable int *grid;
     mutable int nRows;
     mutable int nCols;
diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index 6fec8d7719..0f695c74d5 100644
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -95,7 +95,7 @@ public:
         QDateTime lastModified;
     };
 
-    QVector<FileInfo> fileInfoList() const;
+    QList<FileInfo> fileInfoList() const;
     int count() const;
 
     FileInfo entryInfoAt(int index) const;
diff --git a/src/gui/text/unix/qfontenginemultifontconfig_p.h b/src/gui/text/unix/qfontenginemultifontconfig_p.h
index 7f350aecb7..daaa8baecf 100644
--- a/src/gui/text/unix/qfontenginemultifontconfig_p.h
+++ b/src/gui/text/unix/qfontenginemultifontconfig_p.h
@@ -67,7 +67,7 @@ public:
 private:
     FcPattern* getMatchPatternForFallback(int at) const;
 
-    mutable QVector<FcPattern*> cachedMatchPatterns;
+    mutable QList<FcPattern *> cachedMatchPatterns;
 };
 
 QT_END_NAMESPACE