QDesigner: Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: Icb0da4e9657c1e85632c12fa906cc75272d74306
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

41 files changed, 184 insertions, 177 deletions

diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index 55eb63e2a..b31e2830b 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -47,7 +47,7 @@
 #include <QtGui/qaction.h>
 
 #include <QtCore/qdebug.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 #include <algorithm>
 
@@ -144,7 +144,7 @@ void BuddyEditor::updateBackground()
     ConnectionEdit::updateBackground();
 
     m_updating = true;
-    QVector<Connection *> newList;
+    QList<Connection *> newList;
     const auto label_list = background()->findChildren<QLabel*>();
     for (QLabel *label : label_list) {
         const QString buddy_name = buddy(label, m_formWindow->core());
@@ -166,7 +166,7 @@ void BuddyEditor::updateBackground()
         newList.append(con);
     }
 
-    QVector<Connection *> toRemove;
+    QList<Connection *> toRemove;
 
     const int c = connectionCount();
     for (int i = 0; i < c; i++) {
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index e2e9fca1c..4a1c27035 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -52,7 +52,7 @@
 #include <QtWidgets/qgroupbox.h>
 
 #include <QtCore/qset.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 #include <algorithm>
 
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
 
-using DeviceProfileList = QVector<DeviceProfile>;
+using DeviceProfileList = QList<DeviceProfile>;
 
 enum { profileComboIndexOffset = 1 };
 
diff --git a/src/designer/src/components/formeditor/formeditor_optionspage.cpp b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
index 03bc44d15..c7ca46b42 100644
--- a/src/designer/src/components/formeditor/formeditor_optionspage.cpp
+++ b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
@@ -70,7 +70,7 @@ ZoomSettingsWidget::ZoomSettingsWidget(QWidget *parent) :
     m_zoomCombo(new QComboBox)
 {
     m_zoomCombo->setEditable(false);
-    const QVector<int> &zoomValues = ZoomMenu::zoomValues();
+    const QList<int> &zoomValues = ZoomMenu::zoomValues();
     for (int z : zoomValues) {
         //: Zoom percentage
         m_zoomCombo->addItem(QCoreApplication::translate("FormEditorOptionsPage", "%1 %").arg(z), QVariant(z));
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index d9a73aa50..0915f5d8d 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -95,7 +95,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qbuffer.h>
 #include <QtCore/qtimer.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qxmlstream.h>
 
 Q_DECLARE_METATYPE(QWidget*)
@@ -165,7 +165,7 @@ public:
 
 private:
 
-    using SelectionPool = QVector<WidgetSelection *>;
+    using SelectionPool = QList<WidgetSelection *>;
     SelectionPool m_selectionPool;
 
     typedef QHash<QWidget *, WidgetSelection *> SelectionHash;
@@ -2422,8 +2422,7 @@ void FormWindow::simplifySelection(QWidgetList *sel) const
         sel->push_back(mainC);
         return;
     }
-    using WidgetVector = QVector<QWidget *>;
-    WidgetVector toBeRemoved;
+    QWidgetList toBeRemoved;
     toBeRemoved.reserve(sel->size());
     const QWidgetList::const_iterator scend = sel->constEnd();
     for (QWidgetList::const_iterator it = sel->constBegin(); it != scend; ++it) {
@@ -2442,8 +2441,8 @@ void FormWindow::simplifySelection(QWidgetList *sel) const
     // Now we can actually remove the widgets that were marked
     // for removal in the previous pass.
     if (!toBeRemoved.isEmpty()) {
-        const WidgetVector::const_iterator rcend = toBeRemoved.constEnd();
-        for (WidgetVector::const_iterator it = toBeRemoved.constBegin(); it != rcend; ++it)
+        const QWidgetList::const_iterator rcend = toBeRemoved.constEnd();
+        for (QWidgetList::const_iterator it = toBeRemoved.constBegin(); it != rcend; ++it)
             sel->removeAll(*it);
     }
 }
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 7d549f3f8..e59d8036f 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -534,7 +534,7 @@ void QDesignerResource::saveDom(DomUI *ui, QWidget *widget)
     if (!m_formWindow->includeHints().isEmpty()) {
         const QString local = QStringLiteral("local");
         const QString global = QStringLiteral("global");
-        QVector<DomInclude *> ui_includes;
+        QList<DomInclude *> ui_includes;
         const QStringList &includeHints = m_formWindow->includeHints();
         ui_includes.reserve(includeHints.size());
         for (QString includeHint : includeHints) {
@@ -801,7 +801,7 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget)
 
     // save the actions
     const auto &actionRefs = ui_widget->elementAddAction();
-    ui_widget->setElementAddAction(QVector<DomActionRef *>());
+    ui_widget->setElementAddAction(QList<DomActionRef *>());
 
     QWidget *w = QAbstractFormBuilder::create(ui_widget, parentWidget);
 
@@ -1295,7 +1295,7 @@ inline QString msgUnmanagedPage(QDesignerFormEditorInterface *core,
 DomWidget *QDesignerResource::saveWidget(QWidget *widget, QDesignerContainerExtension *container, DomWidget *ui_parentWidget)
 {
     DomWidget *ui_widget = QAbstractFormBuilder::createDom(widget, ui_parentWidget, false);
-    QVector<DomWidget *> ui_widget_list;
+    QList<DomWidget *> ui_widget_list;
 
     for (int i=0; i<container->count(); ++i) {
         QWidget *page = container->widget(i);
@@ -1316,7 +1316,7 @@ DomWidget *QDesignerResource::saveWidget(QWidget *widget, QDesignerContainerExte
 DomWidget *QDesignerResource::saveWidget(QStackedWidget *widget, DomWidget *ui_parentWidget)
 {
     DomWidget *ui_widget = QAbstractFormBuilder::createDom(widget, ui_parentWidget, false);
-    QVector<DomWidget *> ui_widget_list;
+    QList<DomWidget *> ui_widget_list;
     if (QDesignerContainerExtension *container = qt_extension<QDesignerContainerExtension*>(core()->extensionManager(), widget)) {
         for (int i=0; i<container->count(); ++i) {
             QWidget *page = container->widget(i);
@@ -1375,7 +1375,7 @@ DomWidget *QDesignerResource::saveWidget(QDesignerDockWidget *dockWidget, DomWid
 DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_parentWidget)
 {
     DomWidget *ui_widget = QAbstractFormBuilder::createDom(widget, ui_parentWidget, false);
-    QVector<DomWidget *> ui_widget_list;
+    QList<DomWidget *> ui_widget_list;
 
     if (QDesignerContainerExtension *container = qt_extension<QDesignerContainerExtension*>(core()->extensionManager(), widget)) {
         const int current = widget->currentIndex();
@@ -1442,7 +1442,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren
 DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentWidget)
 {
     DomWidget *ui_widget = QAbstractFormBuilder::createDom(widget, ui_parentWidget, false);
-    QVector<DomWidget *> ui_widget_list;
+    QList<DomWidget *> ui_widget_list;
 
     if (QDesignerContainerExtension *container = qt_extension<QDesignerContainerExtension*>(core()->extensionManager(), widget)) {
         const int current = widget->currentIndex();
@@ -1694,7 +1694,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection)
     bool hasItems = false;
     // Widgets
     if (!selection.m_widgets.isEmpty()) {
-        QVector<DomWidget *> ui_widget_list;
+        QList<DomWidget *> ui_widget_list;
         const int size = selection.m_widgets.size();
         for (int i=0; i< size; ++i) {
             QWidget *w = selection.m_widgets.at(i);
@@ -1711,7 +1711,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection)
     }
     // actions
     if (!selection.m_actions.isEmpty()) {
-        QVector<DomAction *> domActions;
+        QList<DomAction *> domActions;
         for (QAction* action : qAsConst(selection.m_actions)) {
             if (DomAction *domAction = createDom(action))
                 domActions += domAction;
@@ -2116,7 +2116,7 @@ DomResources *QDesignerResource::saveResources()
 DomResources *QDesignerResource::saveResources(const QStringList &qrcPaths)
 {
     QtResourceSet *resourceSet = m_formWindow->resourceSet();
-    QVector<DomResource *> dom_include;
+    QList<DomResource *> dom_include;
     if (resourceSet) {
         const QStringList activePaths = resourceSet->activeResourceFilePaths();
         for (const QString &path : activePaths) {
diff --git a/src/designer/src/components/formeditor/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp
index 9acb4988c..c2b8408d3 100644
--- a/src/designer/src/components/formeditor/qwizard_container.cpp
+++ b/src/designer/src/components/formeditor/qwizard_container.cpp
@@ -33,11 +33,11 @@
 
 #include <QtWidgets/qwizard.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
 
-using WizardPageList = QVector<QWizardPage *>;
+using WizardPageList = QList<QWizardPage *>;
 
 namespace qdesigner_internal {
 
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 248041811..50e13305a 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -61,9 +61,9 @@
 #include <QtWidgets/qstyleditemdelegate.h>
 #include <QtGui/qevent.h>
 
-#include <QtCore/qsortfilterproxymodel.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qsortfilterproxymodel.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -90,7 +90,7 @@ namespace {
         // A widget managed by the form window cursor
         ManagedWidgetSelection };
 
-    using QObjectVector = QVector<QObject *>;
+    using QObjectVector = QList<QObject *>;
 }
 
 static inline SelectionType selectionType(const QDesignerFormWindowInterface *fw, QObject *o)
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
index ee3957270..c539f8f3d 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -269,7 +269,7 @@ namespace qdesigner_internal {
                               ObjectModel &model,
                               const ModelRecursionContext &ctx)
     {
-        using ButtonGroupList = QVector<QButtonGroup *>;
+        using ButtonGroupList = QList<QButtonGroup *>;
         // 1) Create entry
         const ObjectData entry(parent, object, ctx);
         model.push_back(entry);
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
index 14bcf78cb..f138253a5 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h
+++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
@@ -48,7 +48,6 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qpointer.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -115,7 +114,7 @@ namespace qdesigner_internal {
     inline bool operator==(const ObjectData &e1, const ObjectData &e2) { return e1.equals(e2); }
     inline bool operator!=(const ObjectData &e1, const ObjectData &e2) { return !e1.equals(e2); }
 
-    using ObjectModel = QVector<ObjectData>;
+    using ObjectModel = QList<ObjectData>;
 
     // QStandardItemModel for ObjectInspector. Uses ObjectData/ObjectModel
     // internally for its updates.
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.h b/src/designer/src/components/propertyeditor/paletteeditor.h
index b4d649163..8ff10c591 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.h
+++ b/src/designer/src/components/propertyeditor/paletteeditor.h
@@ -137,7 +137,7 @@ private:
 
     QPalette m_palette;
     QPalette m_parentPalette;
-    QVector<RoleEntry> m_roleEntries;
+    QList<RoleEntry> m_roleEntries;
     bool m_compute = true;
 };
 
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 50cb794dc..a26d7d4ea 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -214,7 +214,7 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare
     m_buttonAction(new QAction(tr("Drop Down Button View"), this)),
     m_classLabel(new ElidingLabel)
 {
-    QVector<QColor> colors;
+    QList<QColor> colors;
     colors.reserve(6);
     colors.push_back(QColor(255, 230, 191));
     colors.push_back(QColor(255, 255, 191));
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h
index 993c4418d..331a72303 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.h
+++ b/src/designer/src/components/propertyeditor/propertyeditor.h
@@ -32,9 +32,9 @@
 #include "propertyeditor_global.h"
 #include <qdesigner_propertyeditor_p.h>
 
-#include <QtCore/qpointer.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qpointer.h>
 #include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
@@ -180,7 +180,7 @@ private:
     QMap<QString, bool> m_expansionState;
 
     QString m_filterPattern;
-    QVector<QPair<QColor, QColor> > m_colors;
+    QList<QPair<QColor, QColor> > m_colors;
     QPair<QColor, QColor> m_dynamicColor;
     QPair<QColor, QColor> m_layoutColor;
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index 2e60d3051..28bb2c736 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -70,7 +70,7 @@ DomConnection *SignalSlotConnection::toUi() const
     result->setElementSlot(slot());
 
     DomConnectionHints *hints = new DomConnectionHints;
-    QVector<DomConnectionHint *> list;
+    QList<DomConnectionHint *> list;
 
     QPoint sp = endPointPos(EndPoint::Source);
     QPoint tp = endPointPos(EndPoint::Target);
@@ -322,7 +322,7 @@ Connection *SignalSlotEditor::createConnection(QWidget *source, QWidget *destina
 DomConnections *SignalSlotEditor::toUi() const
 {
     DomConnections *result = new DomConnections;
-    QVector<DomConnection *> list;
+    QList<DomConnection *> list;
 
     const int count = connectionCount();
     list.reserve(count);
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index c2fcb40a5..71051bdbe 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -129,7 +129,7 @@ public:
     bool removeCustomWidgets();
 
 private:
-    using WidgetBoxCategoryEntrys = QVector<WidgetBoxCategoryEntry>;
+    using WidgetBoxCategoryEntrys = QList<WidgetBoxCategoryEntry>;
 
     QDesignerFormEditorInterface *m_core;
     WidgetBoxCategoryEntrys m_items;
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index 12dd80bed..7b40fb5b3 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -32,23 +32,24 @@
 
 #include <QtDesigner/abstractsettings.h>
 
-#include <QtWidgets/qtreeview.h>
-#include <QtWidgets/qtoolbutton.h>
+#include <QtGui/qfontdatabase.h>
+#include <QtGui/qstandarditemmodel.h>
+
 #include <QtWidgets/qboxlayout.h>
-#include <QtWidgets/qlayoutitem.h>
+#include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qfiledialog.h>
-#include <QtGui/qstandarditemmodel.h>
+#include <QtWidgets/qlayoutitem.h>
 #include <QtWidgets/qmessagebox.h>
-#include <QtGui/qfontdatabase.h>
-#include <QtWidgets/qdialogbuttonbox.h>
+#include <QtWidgets/qtoolbutton.h>
+#include <QtWidgets/qtreeview.h>
 
-#include <QtCore/qsettings.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qfileinfo.h>
 #include <QtCore/qalgorithms.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qsettings.h>
+#include <QtCore/qstringlist.h>
 
 #include <algorithm>
 
@@ -82,7 +83,7 @@ public:
 
     // Store loaded fonts as pair of file name and Id
     using FileNameFontIdPair = QPair<QString,int>;
-    using FileNameFontIdPairs = QVector<FileNameFontIdPair>;
+    using FileNameFontIdPairs = QList<FileNameFontIdPair>;
     const FileNameFontIdPairs &fonts() const;
 
 private:
@@ -336,7 +337,7 @@ static void removeFonts(const QModelIndexList &selectedIndexes, AppFontModel *mo
 
     // Reverse sort top level rows and remove
     AppFontManager &fmgr = AppFontManager::instance();
-    QVector<int> rows;
+    QList<int> rows;
     rows.reserve(selectedIndexes.size());
 
     QString errorMessage;
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index ac80dae4a..a11f148a4 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -100,11 +100,11 @@ void MainWindowBase::closeEvent(QCloseEvent *e)
     }
 }
 
-QVector<QToolBar *> MainWindowBase::createToolBars(const QDesignerActions *actions, bool singleToolBar)
+QList<QToolBar *> MainWindowBase::createToolBars(const QDesignerActions *actions, bool singleToolBar)
 {
     // Note that whenever you want to add a new tool bar here, you also have to update the default
     // action groups added to the toolbar manager in the mainwindow constructor
-    QVector<QToolBar *> rc;
+    QList<QToolBar *> rc;
     if (singleToolBar) {
         //: Not currently used (main tool bar)
         QToolBar *main = createToolBar(tr("Main"), QStringLiteral("mainToolBar"), actions->fileActions()->actions());
@@ -205,8 +205,8 @@ ToolBarManager::ToolBarManager(QMainWindow *configureableMainWindow,
                                          QWidget *parent,
                                          QMenu *toolBarMenu,
                                          const QDesignerActions *actions,
-                                         const QVector<QToolBar *> &toolbars,
-                                         const QVector<QDesignerToolWindow *> &toolWindows) :
+                                         const QList<QToolBar *> &toolbars,
+                                         const QList<QDesignerToolWindow *> &toolWindows) :
     QObject(parent),
     m_configureableMainWindow(configureableMainWindow),
     m_parent(parent),
@@ -293,13 +293,13 @@ bool ToolBarManager::restoreState(const QByteArray &state, int version)
 
 DockedMainWindow::DockedMainWindow(QDesignerWorkbench *wb,
                                    QMenu *toolBarMenu,
-                                   const QVector<QDesignerToolWindow *> &toolWindows) :
+                                   const QList<QDesignerToolWindow *> &toolWindows) :
     m_toolBarManager(nullptr)
 {
     setObjectName(QStringLiteral("MDIWindow"));
     setWindowTitle(mainWindowTitle());
 
-    const QVector<QToolBar *> toolbars = createToolBars(wb->actionManager(), false);
+    const QList<QToolBar *> toolbars = createToolBars(wb->actionManager(), false);
     for (QToolBar *tb : toolbars)
         addToolBar(tb);
     DockedMdiArea *dma = new DockedMdiArea(wb->actionManager()->uiExtension());
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index 90b2b58a7..756afd256 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -29,8 +29,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include <QtCore/qlist.h>
+
 #include <QtWidgets/qmainwindow.h>
-#include <QtCore/qvector.h>
 #include <QtWidgets/qmdiarea.h>
 
 QT_BEGIN_NAMESPACE
@@ -70,7 +71,7 @@ public:
     CloseEventPolicy closeEventPolicy() const { return m_policy; }
     void setCloseEventPolicy(CloseEventPolicy pol) { m_policy = pol; }
 
-    static QVector<QToolBar *> createToolBars(const QDesignerActions *actions, bool singleToolBar);
+    static QList<QToolBar *> createToolBars(const QDesignerActions *actions, bool singleToolBar);
     static QString mainWindowTitle();
 
     // Use the minor Qt version as settings versions to avoid conflicts
@@ -117,8 +118,8 @@ public:
                             QWidget *parent,
                             QMenu *toolBarMenu,
                             const QDesignerActions *actions,
-                            const QVector<QToolBar *> &toolbars,
-                            const QVector<QDesignerToolWindow *> &toolWindows);
+                            const QList<QToolBar *> &toolbars,
+                            const QList<QDesignerToolWindow *> &toolWindows);
 
     QByteArray saveState(int version = 0) const;
     bool restoreState(const QByteArray &state, int version = 0);
@@ -133,7 +134,7 @@ private:
     QMenu *m_toolBarMenu;
     QtToolBarManager *m_manager;
     QAction *m_configureAction;
-    QVector<QToolBar *> m_toolbars;
+    QList<QToolBar *> m_toolbars;
 };
 
 /* Main window to be used for docked mode */
@@ -141,8 +142,8 @@ class DockedMainWindow : public MainWindowBase {
     Q_OBJECT
     Q_DISABLE_COPY_MOVE(DockedMainWindow)
 public:
-    using DesignerToolWindowList = QVector<QDesignerToolWindow *>;
-    using DockWidgetList = QVector<QDockWidget *>;
+    using DesignerToolWindowList = QList<QDesignerToolWindow *>;
+    using DockWidgetList = QList<QDockWidget *>;
 
     explicit DockedMainWindow(QDesignerWorkbench *wb,
                               QMenu *toolBarMenu,
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 0577fcc02..f94aa98bd 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -688,7 +688,7 @@ QDesignerFormWindow *QDesignerWorkbench::findFormWindow(QWidget *widget) const
 bool QDesignerWorkbench::handleClose()
 {
     m_state = StateClosing;
-    QVector<QDesignerFormWindow *> dirtyForms;
+    QList<QDesignerFormWindow *> dirtyForms;
     for (QDesignerFormWindow *w : qAsConst(m_formWindows)) {
         if (w->editor()->isDirty())
             dirtyForms << w;
diff --git a/src/designer/src/designer/qdesigner_workbench.h b/src/designer/src/designer/qdesigner_workbench.h
index fea02d59f..e3435b915 100644
--- a/src/designer/src/designer/qdesigner_workbench.h
+++ b/src/designer/src/designer/qdesigner_workbench.h
@@ -33,9 +33,9 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qset.h>
 #include <QtCore/qrect.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -158,15 +158,15 @@ private:
 
     struct TopLevelData {
         ToolBarManager *toolbarManager;
-        QVector<QToolBar *> toolbars;
+        QList<QToolBar *> toolbars;
     };
     TopLevelData m_topLevelData;
 
     UIMode m_mode = NeutralMode;
     DockedMainWindow *m_dockedMainWindow = nullptr;
 
-    QVector<QDesignerToolWindow *> m_toolWindows;
-    QVector<QDesignerFormWindow *> m_formWindows;
+    QList<QDesignerToolWindow *> m_toolWindows;
+    QList<QDesignerFormWindow *> m_formWindows;
 
     QMenu *m_toolbarMenu;
 
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index 8e2e399e0..9d21c5159 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -26,15 +26,18 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
+
 #include <QtGui/qevent.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qpainterpath.h>
+
+#include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qgridlayout.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qpushbutton.h>
-#include <QtWidgets/qdialogbuttonbox.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qpainterpath.h>
 #include <QtWidgets/qstyleoption.h>
+
 #include "versiondialog.h"
 
 QT_BEGIN_NAMESPACE
@@ -54,8 +57,8 @@ protected:
     void mouseReleaseEvent(QMouseEvent *me) override;
     void paintEvent(QPaintEvent *pe) override;
 private:
-    QVector<QPoint> hitPoints;
-    QVector<QPoint> missPoints;
+    QList<QPoint> hitPoints;
+    QList<QPoint> missPoints;
     QPainterPath m_path;
     bool secondStage = false;
     bool m_pushed = false;
diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h
index 141cee8d9..ca4560fda 100644
--- a/src/designer/src/lib/shared/connectionedit_p.h
+++ b/src/designer/src/lib/shared/connectionedit_p.h
@@ -45,7 +45,6 @@
 
 #include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qpointer.h>
 
 #include <QtWidgets/qwidget.h>
@@ -67,7 +66,7 @@ class ConnectionEdit;
 class QDESIGNER_SHARED_EXPORT CETypes
 {
 public:
-    using ConnectionList = QVector<Connection *>;
+    using ConnectionList = QList<Connection *>;
     using ConnectionSet = QHash<Connection*, Connection*> ;
     using WidgetSet = QHash<QWidget*, QWidget*>;
 
@@ -132,7 +131,7 @@ public:
 private:
     QPoint m_source_pos, m_target_pos;
     QObject *m_source, *m_target;
-    QVector<QPoint> m_knee_list;
+    QList<QPoint> m_knee_list;
     QPolygonF m_arrow_head;
     ConnectionEdit *m_edit;
     QString m_source_label, m_target_label;
diff --git a/src/designer/src/lib/shared/grid.cpp b/src/designer/src/lib/shared/grid.cpp
index d1298d1f0..9f9ff7d65 100644
--- a/src/designer/src/lib/shared/grid.cpp
+++ b/src/designer/src/lib/shared/grid.cpp
@@ -28,11 +28,13 @@
 
 #include "grid_p.h"
 
+#include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qvector.h>
+
+#include <QtGui/qevent.h>
 #include <QtGui/qpainter.h>
+
 #include <QtWidgets/qwidget.h>
-#include <QtGui/qevent.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -125,7 +127,7 @@ void Grid::paint(QPainter &p, const QWidget *widget, QPaintEvent *e) const
         const int xend = e->rect().right();
         const int yend = e->rect().bottom();
 
-        using Points = QVector<QPointF>;
+        using Points = QList<QPointF>;
         static Points points;
         points.clear();
 
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp
index cb2ba770a..7b3c7a6b0 100644
--- a/src/designer/src/lib/shared/iconselector.cpp
+++ b/src/designer/src/lib/shared/iconselector.cpp
@@ -57,8 +57,7 @@
 #include <QtGui/qvalidator.h>
 
 #include <QtCore/qdebug.h>
-#include <QtCore/qvector.h>
-
+#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -192,7 +191,7 @@ public:
     void slotResetAllActivated();
     void slotUpdate();
 
-    QVector<QPair<QPair<QIcon::Mode, QIcon::State>, QString> > m_stateToName; // could be static map
+    QList<QPair<QPair<QIcon::Mode, QIcon::State>, QString> > m_stateToName; // could be static map
 
     QMap<QPair<QIcon::Mode, QIcon::State>, int>  m_stateToIndex;
     QMap<int, QPair<QIcon::Mode, QIcon::State> > m_indexToState;
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index d5414dbf1..ce2351d65 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -27,37 +27,37 @@
 ****************************************************************************/
 
 #include "layout_p.h"
+#include "layoutdecoration.h"
 #include "qdesigner_utils_p.h"
+#include "qdesigner_widgetitem_p.h"
 #include "qlayout_widget_p.h"
 #include "spacer_widget_p.h"
-#include "layoutdecoration.h"
 #include "widgetfactory_p.h"
-#include "qdesigner_widgetitem_p.h"
 
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractformwindow.h>
+#include <QtDesigner/abstractmetadatabase.h>
+#include <QtDesigner/abstractwidgetdatabase.h>
 #include <QtDesigner/container.h>
-#include <QtDesigner/qextensionmanager.h>
 #include <QtDesigner/propertysheet.h>
-#include <QtDesigner/abstractwidgetdatabase.h>
-#include <QtDesigner/abstractmetadatabase.h>
+#include <QtDesigner/qextensionmanager.h>
 
 #include <QtCore/qdebug.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qset.h>
 
+#include <QtGui/qbitmap.h>
 #include <QtGui/qevent.h>
-#include <QtWidgets/qgridlayout.h>
 #include <QtGui/qpainter.h>
-#include <QtGui/qbitmap.h>
-#include <QtWidgets/qsplitter.h>
-#include <QtWidgets/qmainwindow.h>
+
 #include <QtWidgets/qapplication.h>
-#include <QtWidgets/qscrollarea.h>
 #include <QtWidgets/qformlayout.h>
+#include <QtWidgets/qgridlayout.h>
 #include <QtWidgets/qlabel.h>
+#include <QtWidgets/qmainwindow.h>
+#include <QtWidgets/qscrollarea.h>
+#include <QtWidgets/qsplitter.h>
 #include <QtWidgets/qwizard.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qset.h>
 
 #include <algorithm>
 
@@ -895,8 +895,8 @@ void Grid::simplify()
 void Grid::shrink()
 {
     //  tick off the occupied cols/rows (bordering on widget edges)
-    QVector<bool> columns(m_ncols, false);
-    QVector<bool> rows(m_nrows, false);
+    QList<bool> columns(m_ncols, false);
+    QList<bool> rows(m_nrows, false);
 
     for (int c = 0; c < m_ncols; c++)
         for (int r = 0; r < m_nrows; r++)
@@ -1122,12 +1122,12 @@ void GridLayout<GridLikeLayout, LayoutType, GridMode>::doLayout()
 }
 
 // Remove duplicate entries (Remove next, if equal to current)
-void removeIntVecDuplicates(QVector<int> &v)
+void removeIntVecDuplicates(QList<int> &v)
 {
     if (v.size() < 2)
         return;
 
-    for (QVector<int>::iterator current = v.begin() ; (current != v.end()) && ((current+1) != v.end()) ; )
+    for (QList<int>::iterator current = v.begin() ; (current != v.end()) && ((current+1) != v.end()) ; )
         if ( *current == *(current+1) )
             v.erase(current+1);
         else
@@ -1154,8 +1154,8 @@ QWidgetList GridLayout<GridLikeLayout, LayoutType, GridMode>::buildGrid(const QW
 
     // We need a list of both start and stop values for x- & y-axis
     const int widgetCount = widgetList.size();
-    QVector<int> x( widgetCount * 2 );
-    QVector<int> y( widgetCount * 2 );
+    QList<int> x( widgetCount * 2 );
+    QList<int> y( widgetCount * 2 );
 
     // Using push_back would look nicer, but operator[] is much faster
     int index  = 0;
diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h
index b428d5bc6..c7a5e2a08 100644
--- a/src/designer/src/lib/shared/newformwidget_p.h
+++ b/src/designer/src/lib/shared/newformwidget_p.h
@@ -46,12 +46,13 @@
 #include <QtDesigner/abstractnewformwidget.h>
 
 #include <QtWidgets/qwidget.h>
+
 #include <QtGui/qpixmap.h>
 
-#include <QtCore/qstringlist.h>
-#include <QtCore/qpair.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,7 +71,7 @@ class QDESIGNER_SHARED_EXPORT NewFormWidget : public QDesignerNewFormWidgetInter
     Q_DISABLE_COPY_MOVE(NewFormWidget)
 
 public:
-    using DeviceProfileList = QVector<qdesigner_internal::DeviceProfile>;
+    using DeviceProfileList = QList<qdesigner_internal::DeviceProfile>;
 
     explicit NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parentWidget);
     ~NewFormWidget() override;
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index 462d74005..bf8d0b60e 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -57,7 +57,7 @@ static const char *skinExtensionC = "skin";
 
 // Pair of skin name, path
 typedef QPair<QString, QString> SkinNamePath;
-using Skins = QVector<SkinNamePath>;
+using Skins = QList<SkinNamePath>;
 enum { SkinComboNoneIndex = 0 };
 
 // find default skins (resources)
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index 374855366..3d04346f3 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -26,40 +26,39 @@
 **
 ****************************************************************************/
 
+#include "formwindowbase_p.h"
 #include "previewmanager_p.h"
 #include "qdesigner_formbuilder_p.h"
 #include "shared_settings_p.h"
-#include "shared_settings_p.h"
-#include "zoomwidget_p.h"
-#include "formwindowbase_p.h"
 #include "widgetfactory_p.h"
+#include "zoomwidget_p.h"
 
 #include <deviceskin.h>
 
-#include <QtDesigner/abstractformwindow.h>
 #include <QtDesigner/abstractformeditor.h>
+#include <QtDesigner/abstractformwindow.h>
 #include <QtDesigner/abstractformwindowmanager.h>
 #include <QtDesigner/abstractsettings.h>
 
-#include <QtWidgets/qwidget.h>
-#include <QtGui/qevent.h>
-#include <QtWidgets/qmainwindow.h>
-#include <QtWidgets/qdockwidget.h>
 #include <QtWidgets/qapplication.h>
-#include <QtGui/qpixmap.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qdialog.h>
+#include <QtWidgets/qdockwidget.h>
+#include <QtWidgets/qmainwindow.h>
 #include <QtWidgets/qmenu.h>
+
 #include <QtGui/qaction.h>
 #include <QtGui/qactiongroup.h>
 #include <QtGui/qcursor.h>
-#include <QtGui/qtransform.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qpixmap.h>
 #include <QtGui/qscreen.h>
+#include <QtGui/qtransform.h>
 
-#include <QtCore/qmap.h>
 #include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
 #include <QtCore/qshareddata.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -556,7 +555,7 @@ public:
 
     QPointer<QWidget> m_activePreview;
 
-    using PreviewDataList = QVector<PreviewData>;
+    using PreviewDataList = QList<PreviewData>;
 
     PreviewDataList m_previews;
 
diff --git a/src/designer/src/lib/shared/promotiontaskmenu_p.h b/src/designer/src/lib/shared/promotiontaskmenu_p.h
index 641efa9b3..ee9f53db0 100644
--- a/src/designer/src/lib/shared/promotiontaskmenu_p.h
+++ b/src/designer/src/lib/shared/promotiontaskmenu_p.h
@@ -42,10 +42,9 @@
 
 #include "shared_global_p.h"
 
+#include <QtCore/qlist.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -112,7 +111,7 @@ private:
     PromotionState createPromotionActions(QDesignerFormWindowInterface *formWindow);
     QDesignerFormWindowInterface *formWindow() const;
 
-    using PromotionSelectionList = QVector<QPointer<QWidget> >;
+    using PromotionSelectionList = QList<QPointer<QWidget> >;
     PromotionSelectionList promotionSelectionList(QDesignerFormWindowInterface *formWindow) const;
 
     Mode m_mode;
diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h
index fc20745f7..2e1299796 100644
--- a/src/designer/src/lib/shared/qdesigner_command_p.h
+++ b/src/designer/src/lib/shared/qdesigner_command_p.h
@@ -40,23 +40,24 @@
 #ifndef QDESIGNER_COMMAND_H
 #define QDESIGNER_COMMAND_H
 
-#include "shared_global_p.h"
-#include "shared_enums_p.h"
 #include "layoutinfo_p.h"
-#include "qdesigner_utils_p.h"
-#include "qdesigner_formwindowcommand_p.h"
 #include "qdesigner_formeditorcommand_p.h"
+#include "qdesigner_formwindowcommand_p.h"
+#include "qdesigner_utils_p.h"
+#include "shared_enums_p.h"
+#include "shared_global_p.h"
 
 #include <QtDesigner/layoutdecoration.h>
 
 #include <QtGui/qicon.h>
+
+#include <QtCore/qhash.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qpair.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qhash.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -180,7 +181,7 @@ private:
 // Helper to correctly unmanage a widget and its children for delete operations
 class  QDESIGNER_SHARED_EXPORT ManageWidgetCommandHelper {
 public:
-    using WidgetVector = QVector<QWidget *>;
+    using WidgetVector = QList<QWidget *>;
 
     ManageWidgetCommandHelper();
     void init(const QDesignerFormWindowInterface *fw, QWidget *widget);
@@ -317,7 +318,7 @@ private:
 class QDESIGNER_SHARED_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand
 {
 public:
-    using WidgetPointerList = QVector<QPointer<QWidget> >;
+    using WidgetPointerList = QList<QPointer<QWidget> >;
 
     explicit PromoteToCustomWidgetCommand(QDesignerFormWindowInterface *formWindow);
 
@@ -355,7 +356,7 @@ public:
     void restore(QDesignerFormWindowInterface *formWindow) const;
 
 private:
-    using WidgetPointerList = QVector<QPointer<QWidget> >;
+    using WidgetPointerList = QList<QPointer<QWidget> >;
     WidgetPointerList m_selection;
     QPointer<QWidget> m_current;
 };
@@ -872,7 +873,7 @@ struct QDESIGNER_SHARED_EXPORT ListContents {
     bool operator==(const ListContents &rhs) const { return m_items == rhs.m_items; }
     bool operator!=(const ListContents &rhs) const { return m_items != rhs.m_items; }
 
-    QVector<ItemData> m_items;
+    QList<ItemData> m_items;
 };
 
 // Data structure representing the contents of a QTableWidget with
@@ -934,7 +935,7 @@ struct QDESIGNER_SHARED_EXPORT TreeWidgetContents {
         //bool m_firstColumnSpanned:1;
         //bool m_hidden:1;
         //bool m_expanded:1;
-        QVector<ItemContents> m_children;
+        QList<ItemContents> m_children;
     };
 
     void clear();
@@ -946,7 +947,7 @@ struct QDESIGNER_SHARED_EXPORT TreeWidgetContents {
     bool operator!=(const TreeWidgetContents &rhs) const { return !(*this == rhs); }
 
     ListContents m_headerItem;
-    QVector<ItemContents> m_rootItems;
+    QList<ItemContents> m_rootItems;
 };
 
 class QDESIGNER_SHARED_EXPORT ChangeTreeContentsCommand: public QDesignerFormWindowCommand
@@ -1017,7 +1018,7 @@ public:
         QAction *before;
         QWidget *widget;
     };
-    using ActionData = QVector<ActionDataItem>;
+    using ActionData = QList<ActionDataItem>;
 
 private:
     QAction *m_action;
diff --git a/src/designer/src/lib/shared/qdesigner_introspection.cpp b/src/designer/src/lib/shared/qdesigner_introspection.cpp
index 099dadc9c..cdf896923 100644
--- a/src/designer/src/lib/shared/qdesigner_introspection.cpp
+++ b/src/designer/src/lib/shared/qdesigner_introspection.cpp
@@ -28,9 +28,9 @@
 
 #include "qdesigner_introspection_p.h"
 
+#include <QtCore/qlist.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -272,13 +272,13 @@ namespace  {
         const qdesigner_internal::QDesignerIntrospection *m_introspection;
         const QMetaObject *m_metaObject;
 
-        using Enumerators = QVector<QDesignerMetaEnumInterface *>;
+        using Enumerators = QList<QDesignerMetaEnumInterface *>;
         Enumerators m_enumerators;
 
-        using Methods = QVector<QDesignerMetaMethodInterface *>;
+        using Methods = QList<QDesignerMetaMethodInterface *>;
         Methods m_methods;
 
-        using Properties = QVector<QDesignerMetaPropertyInterface *>;
+        using Properties = QList<QDesignerMetaPropertyInterface *>;
         Properties m_properties;
 
         QDesignerMetaPropertyInterface *m_userProperty;
diff --git a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp
index e530bcfc1..03cd9a3ad 100644
--- a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp
@@ -229,7 +229,7 @@ DomUI *QDesignerWidgetBox::xmlToUi(const QString &name, const QString &xml, bool
     if (insertFakeTopLevel)  {
         DomWidget *fakeTopLevel = new DomWidget;
         fakeTopLevel->setAttributeClass(QStringLiteral("QWidget"));
-        QVector<DomWidget *> children;
+        QList<DomWidget *> children;
         children.push_back(ui->takeElementWidget());
         fakeTopLevel->setElementWidget(children);
         ui->setElementWidget(fakeTopLevel);
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index 5090aae17..aa0502076 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -199,7 +199,7 @@ static bool removeEmptyCellsOnGrid(GridLikeLayout *grid, const QRect &area)
 {
     // check if there are any items in the way. Should be only spacers
     // Unique out items that span rows/columns.
-    QVector<int> indexesToBeRemoved;
+    QList<int> indexesToBeRemoved;
     indexesToBeRemoved.reserve(grid->count());
     const int rightColumn = area.x() + area.width();
     const int bottomRow = area.y() + area.height();
@@ -460,12 +460,12 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
         void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) override {}
 
         // Helper for restoring layout states
-        using LayoutItemVector = QVector<QLayoutItem *>;
+        using LayoutItemVector = QList<QLayoutItem *>;
         static LayoutItemVector disassembleLayout(QLayout *lt);
         static QLayoutItem *findItemOfWidget(const LayoutItemVector &lv, QWidget *w);
 
     private:
-        using BoxLayoutState = QVector<QWidget *>;
+        using BoxLayoutState = QList<QWidget *>;
 
         static BoxLayoutState state(const QBoxLayout*lt);
 
@@ -604,7 +604,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
         };
         // Horiontal, Vertical pair of state
         typedef QPair<DimensionCellState, DimensionCellState> CellState;
-        using CellStates = QVector<CellState>;
+        using CellStates = QList<CellState>;
 
         // Figure out states of a cell and return as a flat vector of
         // [column1, column2,...] (address as  row * columnCount + col)
@@ -772,8 +772,8 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
     bool GridLayoutState::simplify(const QRect &r, bool testOnly)
     {
         // figure out free rows/columns.
-        QVector<bool> occupiedRows(rowCount, false);
-        QVector<bool> occupiedColumns(colCount, false);
+        QList<bool> occupiedRows(rowCount, false);
+        QList<bool> occupiedColumns(colCount, false);
         // Mark everything outside restriction rectangle as occupied
         const int restrictionLeftColumn = r.x();
         const int restrictionRightColumn = restrictionLeftColumn + r.width();
@@ -1010,7 +1010,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
     class FormLayoutHelper : public  LayoutHelper {
     public:
         typedef QPair<QWidget *, QWidget *> WidgetPair;
-        using FormLayoutState = QVector<WidgetPair>;
+        using FormLayoutState = QList<WidgetPair>;
 
         FormLayoutHelper() = default;
 
@@ -1175,7 +1175,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
     void FormLayoutHelper::simplify(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout, const QRect &restrictionArea)
     {
         using LayoutItemPair = QPair<QLayoutItem*, QLayoutItem*>;
-        using LayoutItemPairs = QVector<LayoutItemPair>;
+        using LayoutItemPairs = QList<LayoutItemPair>;
 
         QFormLayout *formLayout = qobject_cast<QFormLayout *>(LayoutInfo::managedLayout(core, widgetWithManagedLayout));
         Q_ASSERT(formLayout);
diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index 47c33ec22..eca53c216 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -157,7 +157,7 @@ void QSimpleResource::addFakeMethodsToWidgetDataBase(const DomCustomWidget *domC
 // Classes whose base class could not be found are left in the list.
 
 void QSimpleResource::addCustomWidgetsToWidgetDatabase(const QDesignerFormEditorInterface *core,
-                                                       QVector<DomCustomWidget *> &custom_widget_list)
+                                                       QList<DomCustomWidget *> &custom_widget_list)
 {
     QDesignerWidgetDataBaseInterface *db = core->widgetDataBase();
     for (int i=0; i < custom_widget_list.size(); ) {
diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h
index e2dccaa53..2c8ae1456 100644
--- a/src/designer/src/lib/shared/qsimpleresource_p.h
+++ b/src/designer/src/lib/shared/qsimpleresource_p.h
@@ -40,10 +40,11 @@
 #ifndef QSIMPLERESOURCE_H
 #define QSIMPLERESOURCE_H
 
-#include "shared_global_p.h"
 #include "abstractformbuilder.h"
+#include "shared_global_p.h"
+
+#include <QtCore/qlist.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -91,7 +92,7 @@ protected:
 
 private:
     static void addCustomWidgetsToWidgetDatabase(const QDesignerFormEditorInterface *core,
-                                                 QVector<DomCustomWidget *> &custom_widget_list);
+                                                 QList<DomCustomWidget *> &custom_widget_list);
     static void addFakeMethodsToWidgetDataBase(const DomCustomWidget *domCustomWidget, WidgetDataBaseItem *item);
 
     static bool m_warningsEnabled;
diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp
index fec22a015..391cf49a3 100644
--- a/src/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/src/designer/src/lib/shared/qtresourcemodel.cpp
@@ -295,7 +295,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     const auto oldData = m_pathToData.values();
     const auto newData = newPathToData.values();
 
-    QVector<const QByteArray *> toDelete;
+    QList<const QByteArray *> toDelete;
     for (const QByteArray *array : oldData) {
         if (array && !newData.contains(array))
             toDelete.append(array);
diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp
index f7308f0fa..3e4dbe100 100644
--- a/src/designer/src/lib/shared/selectsignaldialog.cpp
+++ b/src/designer/src/lib/shared/selectsignaldialog.cpp
@@ -40,11 +40,13 @@
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qdesktopwidget.h>
 #include <QtWidgets/qpushbutton.h>
-#include <QtGui/qstandarditemmodel.h>
+
 #include <QtGui/qscreen.h>
+#include <QtGui/qstandarditemmodel.h>
+
 #include <QtCore/qitemselectionmodel.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/qvector.h>
 
 #include <algorithm>
 
@@ -54,7 +56,7 @@ namespace qdesigner_internal {
 
 enum { MethodRole = Qt::UserRole + 1 };
 
-using Methods = QVector<SelectSignalDialog::Method>;
+using Methods = QList<SelectSignalDialog::Method>;
 
 SelectSignalDialog::SelectSignalDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/src/designer/src/lib/shared/shared_settings_p.h b/src/designer/src/lib/shared/shared_settings_p.h
index cd7b32779..65dcf29bc 100644
--- a/src/designer/src/lib/shared/shared_settings_p.h
+++ b/src/designer/src/lib/shared/shared_settings_p.h
@@ -45,7 +45,7 @@
 #include "deviceprofile_p.h"
 
 #include <QtCore/qglobal.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -67,7 +67,7 @@ namespace qdesigner_internal {
 
 class QDESIGNER_SHARED_EXPORT QDesignerSharedSettings {
 public:
-    using DeviceProfileList = QVector<DeviceProfile>;
+    using DeviceProfileList = QList<DeviceProfile>;
 
     explicit QDesignerSharedSettings(QDesignerFormEditorInterface *core);
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index 51adb3528..6c947f4ac 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -104,9 +104,9 @@ void ZoomMenu::slotZoomMenu(QAction *a)
     emit zoomChanged(zoomOf(a));
 }
 
-QVector<int> ZoomMenu::zoomValues()
+QList<int> ZoomMenu::zoomValues()
 {
-    QVector<int> rc;
+    QList<int> rc;
     const int nz = sizeof(menuZoomList)/sizeof(int);
     rc.reserve(nz);
     for (int i = 0; i < nz; i++)
diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h
index 774528069..1830be4be 100644
--- a/src/designer/src/lib/shared/zoomwidget_p.h
+++ b/src/designer/src/lib/shared/zoomwidget_p.h
@@ -44,7 +44,8 @@
 
 #include <QtWidgets/qgraphicsview.h>
 #include <QtWidgets/qgraphicsproxywidget.h>
-#include <QtCore/qvector.h>
+
+#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -68,7 +69,7 @@ public:
     int zoom() const;
 
     // Return a list of available zoom values.
-    static QVector<int> zoomValues();
+    static QList<int> zoomValues();
 
 public slots:
     void setZoom(int percent);
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 221acbbaf..3eeb166e5 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1108,7 +1108,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
     if (recursive) {
         if (QLayout *layout = widget->layout()) {
             if (DomLayout *ui_layout = createDom(layout, nullptr, ui_parentWidget)) {
-                QVector<DomLayout *> ui_layouts;
+                QList<DomLayout *> ui_layouts;
                 ui_layouts.append(ui_layout);
 
                 ui_widget->setElementLayout(ui_layouts);
@@ -1117,9 +1117,9 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
     }
 
     // widgets, actions and action groups
-    QVector<DomWidget *> ui_widgets;
-    QVector<DomAction *> ui_actions;
-    QVector<DomActionGroup *> ui_action_groups;
+    QList<DomWidget *> ui_widgets;
+    QList<DomAction *> ui_actions;
+    QList<DomActionGroup *> ui_action_groups;
 
     QObjectList children;
 
@@ -1189,7 +1189,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
     }
 
     // add-action
-    QVector<DomActionRef *> ui_action_refs;
+    QList<DomActionRef *> ui_action_refs;
     const auto &actions = widget->actions();
     ui_action_refs.reserve(actions.size());
     for (QAction *action : actions) {
@@ -1343,7 +1343,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout
         newList = saveLayoutEntries(layout);
     }
 
-    QVector<DomLayoutItem *> ui_items;
+    QList<DomLayoutItem *> ui_items;
     ui_items.reserve(newList.size());
     for (const FormBuilderSaveLayoutEntry &item : qAsConst(newList)) {
         if (DomLayoutItem *ui_item = createDom(item.item, lay, ui_parentWidget)) {
@@ -1583,7 +1583,7 @@ DomButtonGroups *QAbstractFormBuilder::saveButtonGroups(const QWidget *mainConta
     const QObjectList &mchildren = mainContainer->children();
     if (mchildren.isEmpty())
         return nullptr;
-    QVector<DomButtonGroup *> domGroups;
+    QList<DomButtonGroup *> domGroups;
     for (QObject *o : mchildren) {
         if (auto bg = qobject_cast<QButtonGroup *>(o))
             if (DomButtonGroup* dg = createDom(bg))
@@ -1706,7 +1706,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW
 {
     Q_UNUSED(ui_parentWidget);
 
-    QVector<DomColumn *> columns;
+    QList<DomColumn *> columns;
     DomProperty *p;
     QVariant v;
     const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
@@ -1797,7 +1797,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D
     Q_UNUSED(ui_parentWidget);
 
     // save the horizontal header
-    QVector<DomColumn *> columns;
+    QList<DomColumn *> columns;
     for (int c = 0; c < tableWidget->columnCount(); c++) {
         QList<DomProperty*> properties;
         QTableWidgetItem *item = tableWidget->horizontalHeaderItem(c);
@@ -1811,7 +1811,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D
     ui_widget->setElementColumn(columns);
 
     // save the vertical header
-    QVector<DomRow *> rows;
+    QList<DomRow *> rows;
     for (int r = 0; r < tableWidget->rowCount(); r++) {
         QList<DomProperty*> properties;
         QTableWidgetItem *item = tableWidget->verticalHeaderItem(r);
@@ -2471,7 +2471,7 @@ DomActionGroup *QAbstractFormBuilder::createDom(QActionGroup *actionGroup)
 
     ui_action_group->setElementProperty(computeProperties(actionGroup));
 
-    QVector<DomAction *> ui_actions;
+    QList<DomAction *> ui_actions;
 
     const auto &actions = actionGroup->actions();
     ui_actions.reserve(actions.size());
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index f651faaff..e10d1ed78 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -546,7 +546,7 @@ DomColorGroup *QFormBuilderExtra::saveColorGroup(const QPalette &palette,
     const QMetaEnum colorRole_enum = metaEnum<QAbstractFormBuilderGadget>("colorRole");
 
     DomColorGroup *group = new DomColorGroup();
-    QVector<DomColorRole *> colorRoles;
+    QList<DomColorRole *> colorRoles;
 
     const uint mask = palette.resolve();
     for (int role = QPalette::WindowText; role < QPalette::NColorRoles; ++role) {
@@ -675,7 +675,7 @@ DomBrush *QFormBuilderExtra::saveBrush(const QBrush &br)
         gradient->setAttributeType(QLatin1String(gradientType_enum.valueToKey(type)));
         gradient->setAttributeSpread(QLatin1String(gradientSpread_enum.valueToKey(gr->spread())));
         gradient->setAttributeCoordinateMode(QLatin1String(gradientCoordinate_enum.valueToKey(gr->coordinateMode())));
-        QVector<DomGradientStop *> stops;
+        QList<DomGradientStop *> stops;
         const QGradientStops st = gr->stops();
         for (const QGradientStop &pair : st) {
             DomGradientStop *stop = new DomGradientStop();