3 files changed, 32 insertions, 30 deletions

diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index 19ed07d30d..1ca12dfdf7 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -52,14 +52,15 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include "qalgorithms.h"
-#include "qbitarray.h"
-#include "qlist.h"
-#include "qmap.h"
-#include "qpair.h"
-#include <QtCore/qvector.h>
+
+#include <QtCore/qalgorithms.h>
+#include <QtCore/qbitarray.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qpair.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qrect.h>
+
 #include <float.h>
 #include "qlayoutpolicy_p.h"
 #include "qabstractlayoutstyleinfo_p.h"
@@ -277,10 +278,10 @@ public:
 #endif
 
     QBitArray ignore;   // ### rename q_
-    QVector<QGridLayoutBox> boxes;
+    QList<QGridLayoutBox> boxes;
     MultiCellMap multiCellMap;
-    QVector<int> stretches;
-    QVector<qreal> spacings;
+    QList<int> stretches;
+    QList<qreal> spacings;
     bool hasIgnoreFlag;
 };
 
@@ -296,10 +297,10 @@ public:
 #endif
 
     int count;
-    QVector<QStretchParameter> stretches;
-    QVector<QLayoutParameter<qreal> > spacings;
-    QVector<Qt::Alignment> alignments;
-    QVector<QGridLayoutBox> boxes;
+    QList<QStretchParameter> stretches;
+    QList<QLayoutParameter<qreal>> spacings;
+    QList<Qt::Alignment> alignments;
+    QList<QGridLayoutBox> boxes;
 };
 
 
@@ -471,7 +472,7 @@ protected:
     QList<QGridLayoutItem *> q_items;
 private:
     // User input
-    QVector<QGridLayoutItem *> q_grid;
+    QList<QGridLayoutItem *> q_grid;
     QHVContainer<QLayoutParameter<qreal>> q_defaultSpacings;
     QHVContainer<QGridLayoutRowInfo> q_infos;
     Qt::LayoutDirection m_visualDirection;
@@ -500,11 +501,11 @@ private:
 
     // Output
     mutable QSizeF q_cachedSize;
-    mutable QVector<qreal> q_xx;
-    mutable QVector<qreal> q_yy;
-    mutable QVector<qreal> q_widths;
-    mutable QVector<qreal> q_heights;
-    mutable QVector<qreal> q_descents;
+    mutable QList<qreal> q_xx;
+    mutable QList<qreal> q_yy;
+    mutable QList<qreal> q_widths;
+    mutable QList<qreal> q_heights;
+    mutable QList<qreal> q_descents;
 
     friend class QGridLayoutItem;
 };
diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h
index 9367a3783c..41ad22cedb 100644
--- a/src/gui/util/qshadergraph_p.h
+++ b/src/gui/util/qshadergraph_p.h
@@ -77,23 +77,24 @@ public:
         Q_GUI_EXPORT int portIndex(QShaderNodePort::Direction direction, const QString &portName) const noexcept;
 
         QShaderNode node;
-        QVector<int> inputs;
-        QVector<int> outputs;
+        QList<int> inputs;
+        QList<int> outputs;
     };
 
     Q_GUI_EXPORT void addNode(const QShaderNode &node);
     Q_GUI_EXPORT void removeNode(const QShaderNode &node);
-    Q_GUI_EXPORT QVector<QShaderNode> nodes() const noexcept;
+    Q_GUI_EXPORT QList<QShaderNode> nodes() const noexcept;
 
     Q_GUI_EXPORT void addEdge(const Edge &edge);
     Q_GUI_EXPORT void removeEdge(const Edge &edge);
-    Q_GUI_EXPORT QVector<Edge> edges() const noexcept;
+    Q_GUI_EXPORT QList<Edge> edges() const noexcept;
 
-    Q_GUI_EXPORT QVector<Statement> createStatements(const QStringList &enabledLayers = QStringList()) const;
+    Q_GUI_EXPORT QList<Statement>
+    createStatements(const QStringList &enabledLayers = QStringList()) const;
 
 private:
-    QVector<QShaderNode> m_nodes;
-    QVector<Edge> m_edges;
+    QList<QShaderNode> m_nodes;
+    QList<Edge> m_edges;
 };
 
 Q_GUI_EXPORT bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept;
diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h
index c3d149d8a5..15382fe0b4 100644
--- a/src/gui/util/qshadernode_p.h
+++ b/src/gui/util/qshadernode_p.h
@@ -87,7 +87,7 @@ public:
     Q_GUI_EXPORT QStringList layers() const noexcept;
     Q_GUI_EXPORT void setLayers(const QStringList &layers) noexcept;
 
-    Q_GUI_EXPORT QVector<QShaderNodePort> ports() const noexcept;
+    Q_GUI_EXPORT QList<QShaderNodePort> ports() const noexcept;
     Q_GUI_EXPORT void addPort(const QShaderNodePort &port);
     Q_GUI_EXPORT void removePort(const QShaderNodePort &port);
 
@@ -99,15 +99,15 @@ public:
     Q_GUI_EXPORT void addRule(const QShaderFormat &format, const Rule &rule);
     Q_GUI_EXPORT void removeRule(const QShaderFormat &format);
 
-    Q_GUI_EXPORT QVector<QShaderFormat> availableFormats() const;
+    Q_GUI_EXPORT QList<QShaderFormat> availableFormats() const;
     Q_GUI_EXPORT Rule rule(const QShaderFormat &format) const;
 
 private:
     QUuid m_uuid;
     QStringList m_layers;
-    QVector<QShaderNodePort> m_ports;
+    QList<QShaderNodePort> m_ports;
     QHash<QString, QVariant> m_parameters;
-    QVector<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;
+    QList<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;
 };
 
 Q_GUI_EXPORT bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept;