Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
	dependencies.yaml

Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8

55 files changed, 403 insertions, 281 deletions

diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp
index 5e2f9f605..a254bf12a 100644
--- a/src/designer/src/components/formeditor/dpi_chooser.cpp
+++ b/src/designer/src/components/formeditor/dpi_chooser.cpp
@@ -94,7 +94,7 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) :
     setFocusProxy(m_predefinedCombo);
     m_predefinedCombo->setEditable(false);
     m_predefinedCombo->setCurrentIndex(0);
-    connect(m_predefinedCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(m_predefinedCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
             this, &DPI_Chooser::syncSpinBoxes);
     // top row with predefined settings
     QVBoxLayout *vBoxLayout = new QVBoxLayout;
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index 85cc1f930..062fc6e4f 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -145,7 +145,7 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q)
     m_profileCombo->setEditable(false);
     hLayout->addWidget(m_profileCombo);
     m_profileCombo->addItem(EmbeddedOptionsControl::tr("None"));
-    EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged),
                                     m_q, &EmbeddedOptionsControl::slotProfileIndexChanged);
 
     m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png")));
diff --git a/src/designer/src/components/formeditor/formeditor.cpp b/src/designer/src/components/formeditor/formeditor.cpp
index 05e7fc4ee..0e1db2501 100644
--- a/src/designer/src/components/formeditor/formeditor.cpp
+++ b/src/designer/src/components/formeditor/formeditor.cpp
@@ -142,7 +142,7 @@ FormEditor::FormEditor(QObject *parent)
     connect(resourceModel, &QtResourceModel::qrcFileModifiedExternally,
             this, &FormEditor::slotQrcFileChangedExternally);
 
-    QList<QDesignerOptionsPageInterface*> optionsPages;
+    QVector<QDesignerOptionsPageInterface*> optionsPages;
     optionsPages << new TemplateOptionsPage(this) << new FormEditorOptionsPage(this) << new EmbeddedOptionsPage(this);
     setOptionsPages(optionsPages);
 
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 84e065bcb..8285d84c5 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -723,7 +723,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
         sel.prepend(current);
     }
 
-    QList<QDesignerDnDItemInterface*> item_list;
+    QVector<QDesignerDnDItemInterface*> item_list;
     const QPoint globalPos = mapToGlobal(m_startPos);
     const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ?
                             QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop;
@@ -2827,7 +2827,7 @@ bool FormWindow::dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &g
     return true;
 }
 
-bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target,
+bool FormWindow::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target,
                              const QPoint &global_mouse_pos)
 {
 
diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h
index abecc8252..cb5019d35 100644
--- a/src/designer/src/components/formeditor/formwindow.h
+++ b/src/designer/src/components/formeditor/formwindow.h
@@ -189,7 +189,7 @@ public:
     void resizeWidget(QWidget *widget, const QRect &geometry);
 
     bool dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &global_mouse_pos);
-    bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target,
+    bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target,
                      const QPoint &global_mouse_pos) override;
 
     QWidget *findContainer(QWidget *w, bool excludeLayout) const override;
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.h b/src/designer/src/components/formeditor/formwindow_widgetstack.h
index 01ee921fd..e1a5dd161 100644
--- a/src/designer/src/components/formeditor/formwindow_widgetstack.h
+++ b/src/designer/src/components/formeditor/formwindow_widgetstack.h
@@ -76,7 +76,7 @@ protected:
     QWidget *defaultEditor() const;
 
 private:
-    QList<QDesignerFormWindowToolInterface*> m_tools;
+    QVector<QDesignerFormWindowToolInterface*> m_tools;
     QWidget *m_formContainer;
     QStackedLayout *m_formContainerLayout;
     QStackedLayout *m_layout;
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index 692b20c54..ce3db6583 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -955,7 +955,7 @@ void FormWindowManager::deviceProfilesChanged()
 
 // DnD stuff
 
-void FormWindowManager::dragItems(const QList<QDesignerDnDItemInterface*> &item_list)
+void FormWindowManager::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list)
 {
     QDesignerMimeData::execDrag(item_list, m_core->topLevel());
 }
diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h
index d9723cea6..cae24e407 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.h
+++ b/src/designer/src/components/formeditor/formwindowmanager.h
@@ -77,7 +77,7 @@ public:
 
     bool eventFilter(QObject *o, QEvent *e) override;
 
-    void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) override;
+    void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) override;
 
     QUndoGroup *undoGroup() const;
 
@@ -122,7 +122,7 @@ private:
 
     QDesignerFormEditorInterface *m_core;
     FormWindow *m_activeFormWindow;
-    QList<FormWindow*> m_formWindows;
+    QVector<FormWindow*> m_formWindows;
 
     PreviewManager *m_previewManager;
 
diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp
index de03c6792..3e24b7623 100644
--- a/src/designer/src/components/formeditor/formwindowsettings.cpp
+++ b/src/designer/src/components/formeditor/formwindowsettings.cpp
@@ -108,12 +108,13 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw)
     defaultMargin =  defaultSpacing = INT_MIN;
     fw->layoutDefault(&defaultMargin, &defaultSpacing);
 
-    QStyle *style = fw->formContainer()->style();
+    auto container = fw->formContainer();
+    QStyle *style = container->style();
     layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN;
     if (defaultMargin == INT_MIN)
-        defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr);
+        defaultMargin = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, container);
     if (defaultSpacing == INT_MIN)
-        defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr);
+        defaultSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr);
 
 
     marginFunction.clear();
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index ff4a42744..2a1cdce3f 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -108,7 +108,7 @@ Q_DECLARE_METATYPE(QWidgetList)
 QT_BEGIN_NAMESPACE
 
 namespace {
-    using DomPropertyList = QList<DomProperty *>;
+    using DomPropertyList = QVector<DomProperty *>;
 }
 
 static const char *currentUiVersion = "4.0";
@@ -939,7 +939,7 @@ static bool readDomEnumerationValue(const DomProperty *p,
     return false;
 }
 
-void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &properties)
+void QDesignerResource::applyProperties(QObject *o, const QVector<DomProperty*> &properties)
 {
     if (properties.isEmpty())
         return;
@@ -1387,7 +1387,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren
                 designerWarning(msgUnmanagedPage(core(), widget, i, page));
                 continue;
             }
-            QList<DomProperty*> ui_attribute_list;
+            QVector<DomProperty*> ui_attribute_list;
 
             const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
             // attribute `icon'
@@ -1456,7 +1456,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW
             }
 
             // attribute `label'
-            QList<DomProperty*> ui_attribute_list;
+            QVector<DomProperty*> ui_attribute_list;
 
             const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
 
@@ -1534,7 +1534,7 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const
     const QDesignerMetaObjectInterface *meta = core()->introspection()->metaObject(obj);
 
     const int pindex = meta->indexOfProperty(prop);
-    if (pindex != -1 && !(meta->property(pindex)->attributes(obj) & QDesignerMetaPropertyInterface::StoredAttribute))
+    if (pindex != -1 && !meta->property(pindex)->attributes().testFlag(QDesignerMetaPropertyInterface::StoredAttribute))
         return false;
 
     if (prop == QStringLiteral("objectName") || prop == QStringLiteral("spacerName"))  // ### don't store the property objectName
@@ -1889,13 +1889,13 @@ bool QDesignerResource::canCompressSpacings(QObject *object) const
     return false;
 }
 
-QList<DomProperty*> QDesignerResource::computeProperties(QObject *object)
+QVector<DomProperty*> QDesignerResource::computeProperties(QObject *object)
 {
-    QList<DomProperty*> properties;
+    QVector<DomProperty*> properties;
     if (QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), object)) {
         QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core()->extensionManager(), object);
         const int count = sheet->count();
-        QList<DomProperty *> spacingProperties;
+        QVector<DomProperty *> spacingProperties;
         const bool compressSpacings = canCompressSpacings(object);
         for (int index = 0; index < count; ++index) {
             if (!sheet->isChanged(index) && (!dynamicSheet || !dynamicSheet->isDynamicProperty(index)))
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h
index d667f1372..78e4bacb6 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.h
+++ b/src/designer/src/components/formeditor/qdesigner_resource.h
@@ -90,8 +90,8 @@ protected:
     QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override;
     QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override;
     QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override;
-    void applyProperties(QObject *o, const QList<DomProperty*> &properties) override;
-    QList<DomProperty*> computeProperties(QObject *obj) override;
+    void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override;
+    QVector<DomProperty*> computeProperties(QObject *obj) override;
     DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) override;
 
     QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override;
@@ -145,7 +145,7 @@ private:
     QStringList mergeWithLoadedPaths(const QStringList &paths) const;
     void applyAttributesToPropertySheet(const DomWidget *ui_widget, QWidget *widget);
 
-    using DomCustomWidgetList = QList<DomCustomWidget *>;
+    using DomCustomWidgetList = QVector<DomCustomWidget *>;
     void addCustomWidgetsToWidgetDatabase(DomCustomWidgetList& list);
     FormWindow *m_formWindow;
     bool m_isMainWidget;
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp
index 180c38e79..37b376115 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.cpp
+++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp
@@ -92,7 +92,7 @@ Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
     if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget())) {
         // Make sure that me is actually managed by mw, otherwise
         // QMainWindow::dockWidgetArea() will be VERY upset
-        QList<QLayout*> candidates;
+        QVector<QLayout*> candidates;
         if (mw->layout()) {
             candidates.append(mw->layout());
             candidates += mw->layout()->findChildren<QLayout*>();
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
index 14bcf78cb..35446cc49 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h
+++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
@@ -76,7 +76,7 @@ namespace qdesigner_internal {
             ExtensionContainer   // QTabWidget and the like, container extension
         };
 
-        using StandardItemList = QList<QStandardItem *>;
+        using StandardItemList = QVector<QStandardItem *>;
 
         explicit ObjectData(QObject *parent, QObject *object, const ModelRecursionContext &ctx);
         ObjectData();
@@ -121,7 +121,7 @@ namespace qdesigner_internal {
     // internally for its updates.
     class ObjectInspectorModel : public QStandardItemModel {
     public:
-        using StandardItemList = QList<QStandardItem *>;
+        using StandardItemList = QVector<QStandardItem *>;
         enum { ObjectNameColumn, ClassNameColumn, NumColumns };
 
         explicit ObjectInspectorModel(QObject *parent);
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 27d265696..94853da86 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -1291,7 +1291,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
         }
         pfit.value().clear();
 
-        QList<uint> values;
+        QVector<uint> values;
 
         for (const QPair<QString, uint> &pair : flags) {
             const QString flagName = pair.first;
@@ -2040,7 +2040,7 @@ void DesignerPropertyManager::initializeProperty(QtProperty *property)
     default:
         if (type == designerFlagTypeId()) {
             m_flagValues[property] = FlagData();
-            m_propertyToFlags[property] = QList<QtProperty *>();
+            m_propertyToFlags[property] = QVector<QtProperty *>();
         }  else if (type == designerAlignmentTypeId()) {
             const uint align = Qt::AlignLeft | Qt::AlignVCenter;
             m_alignValues[property] = align;
@@ -2266,7 +2266,7 @@ void DesignerEditorFactory::disconnectPropertyManager(QtVariantPropertyManager *
 }
 
 // A helper that calls a setter with a value on a pointer list of editor objects.
-// Could use QList<Editor*> instead of EditorContainer/Editor, but that crashes VS 6.
+// Could use QVector<Editor*> instead of EditorContainer/Editor, but that crashes VS 6.
 template <class EditorContainer, class Editor, class SetterParameter, class Value>
 static inline void applyToEditors(const EditorContainer &list, void (Editor::*setter)(SetterParameter), const Value &value)
 {
@@ -2544,7 +2544,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
 
 template <class Editor>
 bool removeEditor(QObject *object,
-                QMap<QtProperty *, QList<Editor> > *propertyToEditors,
+                QMap<QtProperty *, QVector<Editor> > *propertyToEditors,
                 QMap<Editor, QtProperty *> *editorToProperty)
 {
     if (!propertyToEditors)
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h
index abc6e385c..85c183a31 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h
@@ -44,7 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 typedef QPair<QString, uint> DesignerIntPair;
-using DesignerFlagList = QList<DesignerIntPair>;
+using DesignerFlagList = QVector<DesignerIntPair>;
 
 class QDesignerFormEditorInterface;
 class QLineEdit;
@@ -80,7 +80,7 @@ private slots:
     void slotPropertyChanged(QtProperty *property);
     void slotEditorDestroyed(QObject *object);
 private:
-    QMap<QtProperty *, QList<ResetWidget *> > m_createdResetWidgets;
+    QMap<QtProperty *, QVector<ResetWidget *> > m_createdResetWidgets;
     QMap<ResetWidget *, QtProperty *> m_resetWidgetToProperty;
     int m_spacing;
     const QDesignerFormEditorInterface *m_core;
@@ -180,11 +180,11 @@ private:
     {
         uint val{0};
         DesignerFlagList flags;
-        QList<uint> values;
+        QVector<uint> values;
     };
     typedef QMap<QtProperty *, FlagData> PropertyFlagDataMap;
     PropertyFlagDataMap m_flagValues;
-    typedef  QMap<QtProperty *, QList<QtProperty *> > PropertyToPropertyListMap;
+    typedef  QMap<QtProperty *, QVector<QtProperty *> > PropertyToPropertyListMap;
     PropertyToPropertyListMap m_propertyToFlags;
     QMap<QtProperty *, QtProperty *> m_flagToProperty;
 
@@ -290,28 +290,28 @@ private:
 
     int m_spacing;
 
-    QMap<QtProperty *, QList<TextEditor *> >                m_stringPropertyToEditors;
-    QMap<TextEditor *, QtProperty *>                        m_editorToStringProperty;
-    QMap<QtProperty *, QList<QKeySequenceEdit *> >         m_keySequencePropertyToEditors;
+    QMap<QtProperty *, QVector<TextEditor *> >             m_stringPropertyToEditors;
+    QMap<TextEditor *, QtProperty *>                       m_editorToStringProperty;
+    QMap<QtProperty *, QVector<QKeySequenceEdit *> >       m_keySequencePropertyToEditors;
     QMap<QKeySequenceEdit *, QtProperty *>                 m_editorToKeySequenceProperty;
-    QMap<QtProperty *, QList<PaletteEditorButton *> >       m_palettePropertyToEditors;
-    QMap<PaletteEditorButton *, QtProperty *>               m_editorToPaletteProperty;
-    QMap<QtProperty *, QList<PixmapEditor *> >              m_pixmapPropertyToEditors;
-    QMap<PixmapEditor *, QtProperty *>                      m_editorToPixmapProperty;
-    QMap<QtProperty *, QList<PixmapEditor *> >              m_iconPropertyToEditors;
-    QMap<PixmapEditor *, QtProperty *>                      m_editorToIconProperty;
-    QMap<QtProperty *, QList<QLineEdit *> >                 m_uintPropertyToEditors;
-    QMap<QLineEdit *, QtProperty *>                         m_editorToUintProperty;
-    QMap<QtProperty *, QList<QLineEdit *> >                 m_longLongPropertyToEditors;
-    QMap<QLineEdit *, QtProperty *>                         m_editorToLongLongProperty;
-    QMap<QtProperty *, QList<QLineEdit *> >                 m_uLongLongPropertyToEditors;
-    QMap<QLineEdit *, QtProperty *>                         m_editorToULongLongProperty;
-    QMap<QtProperty *, QList<TextEditor *> >                m_urlPropertyToEditors;
-    QMap<TextEditor *, QtProperty *>                        m_editorToUrlProperty;
-    QMap<QtProperty *, QList<TextEditor *> >                m_byteArrayPropertyToEditors;
-    QMap<TextEditor *, QtProperty *>                        m_editorToByteArrayProperty;
-    QMap<QtProperty *, QList<StringListEditorButton *> >    m_stringListPropertyToEditors;
-    QMap<StringListEditorButton *, QtProperty *>            m_editorToStringListProperty;
+    QMap<QtProperty *, QVector<PaletteEditorButton *> >    m_palettePropertyToEditors;
+    QMap<PaletteEditorButton *, QtProperty *>              m_editorToPaletteProperty;
+    QMap<QtProperty *, QVector<PixmapEditor *> >           m_pixmapPropertyToEditors;
+    QMap<PixmapEditor *, QtProperty *>                     m_editorToPixmapProperty;
+    QMap<QtProperty *, QVector<PixmapEditor *> >           m_iconPropertyToEditors;
+    QMap<PixmapEditor *, QtProperty *>                     m_editorToIconProperty;
+    QMap<QtProperty *, QVector<QLineEdit *> >              m_uintPropertyToEditors;
+    QMap<QLineEdit *, QtProperty *>                        m_editorToUintProperty;
+    QMap<QtProperty *, QVector<QLineEdit *> >              m_longLongPropertyToEditors;
+    QMap<QLineEdit *, QtProperty *>                        m_editorToLongLongProperty;
+    QMap<QtProperty *, QVector<QLineEdit *> >              m_uLongLongPropertyToEditors;
+    QMap<QLineEdit *, QtProperty *>                        m_editorToULongLongProperty;
+    QMap<QtProperty *, QVector<TextEditor *> >             m_urlPropertyToEditors;
+    QMap<TextEditor *, QtProperty *>                       m_editorToUrlProperty;
+    QMap<QtProperty *, QVector<TextEditor *> >             m_byteArrayPropertyToEditors;
+    QMap<TextEditor *, QtProperty *>                       m_editorToByteArrayProperty;
+    QMap<QtProperty *, QVector<StringListEditorButton *> > m_stringListPropertyToEditors;
+    QMap<StringListEditorButton *, QtProperty *>           m_editorToStringListProperty;
 };
 
 } // namespace qdesigner_internal
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.h b/src/designer/src/components/propertyeditor/fontpropertymanager.h
index 1041cd357..fd6c5186f 100644
--- a/src/designer/src/components/propertyeditor/fontpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/fontpropertymanager.h
@@ -81,7 +81,7 @@ public:
 
 private:
     using PropertyToPropertyMap = QMap<QtProperty *, QtProperty *>;
-    using PropertyList = QList<QtProperty *>;
+    using PropertyList = QVector<QtProperty *>;
     using PropertyToSubPropertiesMap = QMap<QtProperty *, PropertyList>;
 
     void removeAntialiasingProperty(QtProperty *);
diff --git a/src/designer/src/components/propertyeditor/previewframe.cpp b/src/designer/src/components/propertyeditor/previewframe.cpp
index a97e46877..c093663e2 100644
--- a/src/designer/src/components/propertyeditor/previewframe.cpp
+++ b/src/designer/src/components/propertyeditor/previewframe.cpp
@@ -78,7 +78,7 @@ PreviewFrame::PreviewFrame(QWidget *parent) :
 
 void PreviewFrame::setPreviewPalette(const QPalette &pal)
 {
-    ensureMdiSubWindow()->widget()->setPalette(pal);
+    ensureMdiSubWindow()->setPalette(pal);
 }
 
 void PreviewFrame::setSubWindowActive(bool active)
diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp
index cc5a3af31..d041ec9be 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.cpp
+++ b/src/designer/src/components/propertyeditor/previewwidget.cpp
@@ -28,6 +28,11 @@
 
 #include "previewwidget.h"
 
+#include <QtWidgets/qaction.h>
+#include <QtWidgets/qmenu.h>
+
+#include <QtCore/qabstractitemmodel.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace qdesigner_internal;
@@ -36,6 +41,16 @@ PreviewWidget::PreviewWidget(QWidget *parent)
     : QWidget(parent)
 {
     ui.setupUi(this);
+    ui.treeWidget->expandAll();
+    auto model = ui.treeWidget->model();
+    ui.treeWidget->setCurrentIndex(model->index(0, 0, model->index(0, 0)));
+    auto toolButtonMenu = new QMenu(ui.menuToolButton);
+    toolButtonMenu->addAction(tr("Option 1"));
+    toolButtonMenu->addSeparator();
+    auto checkable = toolButtonMenu->addAction(tr("Checkable"));
+    checkable->setCheckable(true);
+    ui.menuToolButton->setMenu(toolButtonMenu);
+    ui.menuToolButton->setPopupMode(QToolButton::InstantPopup);
 }
 
 PreviewWidget::~PreviewWidget() = default;
diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui
index fc81c8b85..077ff24b4 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.ui
+++ b/src/designer/src/components/propertyeditor/previewwidget.ui
@@ -1,4 +1,5 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <comment>*********************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -27,191 +28,296 @@
 **
 *********************************************************************</comment>
  <class>qdesigner_internal::PreviewWidget</class>
- <widget class="QWidget" name="qdesigner_internal::PreviewWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="qdesigner_internal::PreviewWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>471</width>
-    <height>251</height>
+    <width>608</width>
+    <height>367</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string extracomment="Palette Editor Preview Widget">Preview Window</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item rowspan="3" row="0" column="1" >
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="buttonGroup">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Buttons</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLineEdit" name="LineEdit1" >
-       <property name="text" >
-        <string extracomment="Palette Editor Preview Widget">LineEdit</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="ComboBox1" >
-       <item>
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">ComboBox</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QSpinBox" name="SpinBox1" />
-       </item>
-       <item>
-        <widget class="QPushButton" name="PushButton1" >
-         <property name="text" >
-          <string extracomment="Palette Editor Preview Widget">PushButton</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QScrollBar" name="ScrollBar1" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="Slider1" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QListWidget" name="listWidget" >
-       <property name="maximumSize" >
-        <size>
-         <width>32767</width>
-         <height>50</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QProgressBar" name="ProgressBar1" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="RadioButton1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton1</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton2">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton3">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton3</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="CheckBox1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">CheckBox1</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="CheckBox2">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Tristate CheckBox</string>
+          </property>
+          <property name="tristate">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QPushButton" name="PushButton1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">PushButton</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="toggleButton">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">ToggleButton</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="toolButton">
+            <property name="text">
+             <string extracomment="Palette Editor Preview Widget">ToolButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="menuToolButton">
+            <property name="text">
+             <string extracomment="Palette Editor Preview Widget">Menu</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="ButtonGroup2" >
-     <property name="title" >
-      <string extracomment="Palette Editor Preview Widget">ButtonGroup2</string>
+   <item row="0" column="1">
+    <widget class="QGroupBox" name="itemGroupBox">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Item Views</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
       <item>
-       <widget class="QCheckBox" name="CheckBox1" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">CheckBox1</string>
-        </property>
-        <property name="checked" >
+       <widget class="QTreeWidget" name="treeWidget">
+        <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
+        <column>
+         <property name="text">
+          <string extracomment="Palette Editor Preview Widget">Column 1</string>
+         </property>
+        </column>
+        <item>
+         <property name="text">
+          <string extracomment="Palette Editor Preview Widget">Top Level 1</string>
+         </property>
+         <item>
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Nested Item 1</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Nested Item 2</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Nested Item 3</string>
+          </property>
+         </item>
+        </item>
        </widget>
       </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="simpleGroupBox">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Simple Input Widgets</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLineEdit" name="LineEdit1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">LineEdit</string>
+          </property>
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="ComboBox1">
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">ComboBox</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">Item1</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">Item2</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
-       <widget class="QCheckBox" name="CheckBox2" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">CheckBox2</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QSpinBox" name="SpinBox1"/>
+        </item>
+        <item>
+         <widget class="QScrollBar" name="ScrollBar1">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSlider" name="Slider1">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="ButtonGroup1" >
-     <property name="title" >
-      <string extracomment="Palette Editor Preview Widget">ButtonGroup</string>
+   <item row="1" column="1">
+    <widget class="QGroupBox" name="displayGroupBox">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Display Widgets</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
-       <widget class="QRadioButton" name="RadioButton1" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton1</string>
+       <widget class="QProgressBar" name="ProgressBar1">
+        <property name="value">
+         <number>50</number>
         </property>
-        <property name="checked" >
-         <bool>true</bool>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RadioButton2" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton2</string>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string extracomment="Palette Editor Preview Widget">QLabel</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RadioButton3" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton3</string>
+       <widget class="QLabel" name="label_2">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="text">
+         <string extracomment="Palette Editor Preview Widget">QLabel with frame</string>
         </property>
        </widget>
       </item>
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 392f1c3f5..70bbcdb34 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -432,7 +432,7 @@ bool PropertyEditor::isItemVisible(QtBrowserItem *item) const
  * - Anything below (properties) is assumed to be collapsed
  * That is, the map is required, the state cannot be stored in a set */
 
-void PropertyEditor::storePropertiesExpansionState(const QList<QtBrowserItem *> &items)
+void PropertyEditor::storePropertiesExpansionState(const QVector<QtBrowserItem *> &items)
 {
     const QChar bar = QLatin1Char('|');
     for (QtBrowserItem *propertyItem : items) {
@@ -475,7 +475,7 @@ void PropertyEditor::collapseAll()
         setExpanded(group, false);
 }
 
-void PropertyEditor::applyPropertiesExpansionState(const QList<QtBrowserItem *> &items)
+void PropertyEditor::applyPropertiesExpansionState(const QVector<QtBrowserItem *> &items)
 {
     const QChar bar = QLatin1Char('|');
     for (QtBrowserItem *propertyItem : items) {
@@ -516,7 +516,7 @@ void PropertyEditor::applyExpansionState()
     }
 }
 
-int PropertyEditor::applyPropertiesFilter(const QList<QtBrowserItem *> &items)
+int PropertyEditor::applyPropertiesFilter(const QVector<QtBrowserItem *> &items)
 {
     int showCount = 0;
     const bool matchAll = m_filterPattern.isEmpty();
@@ -1011,7 +1011,7 @@ void PropertyEditor::setObject(QObject *object)
                         m_updatingBrowser = false;
                     } else if (type == DesignerPropertyManager::designerFlagTypeId()) {
                         const PropertySheetFlagValue f = qvariant_cast<PropertySheetFlagValue>(value);
-                        QList<QPair<QString, uint> > flags;
+                        QVector<QPair<QString, uint> > flags;
                         for (const QString &name : f.metaFlags.keys()) {
                             const uint val = f.metaFlags.keyToValue(name);
                             flags.append(qMakePair(name, val));
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h
index 993c4418d..0d5ade2d2 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.h
+++ b/src/designer/src/components/propertyeditor/propertyeditor.h
@@ -108,10 +108,10 @@ private:
     QString realClassName(QObject *object) const;
     void storeExpansionState();
     void applyExpansionState();
-    void storePropertiesExpansionState(const QList<QtBrowserItem *> &items);
-    void applyPropertiesExpansionState(const QList<QtBrowserItem *> &items);
+    void storePropertiesExpansionState(const QVector<QtBrowserItem *> &items);
+    void applyPropertiesExpansionState(const QVector<QtBrowserItem *> &items);
     void applyFilter();
-    int applyPropertiesFilter(const QList<QtBrowserItem *> &items);
+    int applyPropertiesFilter(const QVector<QtBrowserItem *> &items);
     void setExpanded(QtBrowserItem *item, bool expanded);
     bool isExpanded(QtBrowserItem *item) const;
     void setItemVisible(QtBrowserItem *item, bool visible);
@@ -157,7 +157,7 @@ private:
     QMap<QString, QtVariantProperty*> m_nameToProperty;
     QMap<QtProperty*, QString> m_propertyToGroup;
     QMap<QString, QtVariantProperty*> m_nameToGroup;
-    QList<QtProperty *> m_groups;
+    QVector<QtProperty *> m_groups;
     QtProperty *m_dynamicGroup = nullptr;
     QString m_recentlyAddedDynamicProperty;
     bool m_updatingBrowser = false;
diff --git a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h
index 7ab98c3d4..ef0c52a80 100644
--- a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h
+++ b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h
@@ -71,7 +71,7 @@ struct ClassMemberFunctions
     QStringList m_memberList;
 };
 
-using ClassesMemberFunctions = QList<ClassMemberFunctions>;
+using ClassesMemberFunctions = QVector<ClassMemberFunctions>;
 
 // Return classes and members in reverse class order to
 // populate of the combo of the ToolWindow.
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp
index 80e9d45c3..9940fcfdc 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -56,8 +56,8 @@ namespace qdesigner_internal {
 
 enum { debugButtonMenu = 0 };
 
-using ButtonList = QList<QAbstractButton *>;
-using ButtonGroupList = QList<QButtonGroup *>;
+using ButtonList = QVector<QAbstractButton *>;
+using ButtonGroupList = QVector<QButtonGroup *>;
 
 // ButtonGroupCommand: Base for commands handling button groups and button lists
 // addButtonsToGroup() and removeButtonsFromGroup() are low-level helpers for
@@ -363,7 +363,7 @@ QAction *ButtonGroupTaskMenu::preferredEditAction() const
     return m_menu.selectGroupAction();
 }
 
-QList<QAction*> ButtonGroupTaskMenu::taskActions() const
+QVector<QAction*> ButtonGroupTaskMenu::taskActions() const
 {
     m_menu.initialize(QDesignerFormWindowInterface::findFormWindow(m_buttonGroup), m_buttonGroup);
     return m_taskActions;
@@ -509,7 +509,7 @@ bool ButtonTaskMenu::refreshAssignMenu(const QDesignerFormWindowInterface *fw, i
     return !m_assignGroupSubMenu->isEmpty();
 }
 
-QList<QAction*> ButtonTaskMenu::taskActions() const
+QVector<QAction*> ButtonTaskMenu::taskActions() const
 {
     ButtonTaskMenu *ncThis = const_cast<ButtonTaskMenu*>(this);
     QButtonGroup *buttonGroup = nullptr;
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h
index ab58c0630..6123543a7 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.h
+++ b/src/designer/src/components/taskmenu/button_taskmenu.h
@@ -84,11 +84,11 @@ public:
     explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
     QButtonGroup *m_buttonGroup;
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
     mutable ButtonGroupMenu m_menu;
 };
 
@@ -102,7 +102,7 @@ public:
     ~ButtonTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
     QAbstractButton *button() const;
 
@@ -125,7 +125,7 @@ private:
     bool refreshAssignMenu(const QDesignerFormWindowInterface *fw, int buttonCount, SelectionType st, QButtonGroup *currentGroup);
     QMenu *createGroupSelectionMenu(const QDesignerFormWindowInterface *fw);
 
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
     mutable ButtonGroupMenu m_groupMenu;
     QMenu *m_assignGroupSubMenu;
     QActionGroup *m_assignActionGroup;
diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
index 6d96e9795..dbf367529 100644
--- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
@@ -68,7 +68,7 @@ QAction *ComboBoxTaskMenu::preferredEditAction() const
     return m_editItemsAction;
 }
 
-QList<QAction*> ComboBoxTaskMenu::taskActions() const
+QVector<QAction*> ComboBoxTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.h b/src/designer/src/components/taskmenu/combobox_taskmenu.h
index 8ff36c1a8..6bb97398f 100644
--- a/src/designer/src/components/taskmenu/combobox_taskmenu.h
+++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h
@@ -51,7 +51,7 @@ public:
     ~ComboBoxTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void editItems();
@@ -61,7 +61,7 @@ private:
     QComboBox *m_comboBox;
     QPointer<QDesignerFormWindowInterface> m_formWindow;
     QPointer<QLineEdit> m_editor;
-    mutable QList<QAction*> m_taskActions;
+    mutable QVector<QAction*> m_taskActions;
     QAction *m_editItemsAction;
 };
 
diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
index b4cd1cb2b..47d03e794 100644
--- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
@@ -145,7 +145,7 @@ QString ContainerWidgetTaskMenu::pageMenuText(ContainerType ct, int index, int c
     return tr("Page %1 of %2").arg(index + 1).arg(count);
 }
 
-QList<QAction*> ContainerWidgetTaskMenu::taskActions() const
+QVector<QAction*> ContainerWidgetTaskMenu::taskActions() const
 {
     const QDesignerContainerExtension *ce = containerExtension();
     const int index = ce->currentIndex();
@@ -231,7 +231,7 @@ WizardContainerWidgetTaskMenu::WizardContainerWidgetTaskMenu(QWizard *w, QObject
     l.push_front(createSeparator());
 }
 
-QList<QAction*> WizardContainerWidgetTaskMenu::taskActions() const
+QVector<QAction*> WizardContainerWidgetTaskMenu::taskActions() const
 {
     // Enable
     const QDesignerContainerExtension *ce = containerExtension();
@@ -269,7 +269,7 @@ void MdiContainerWidgetTaskMenu::initializeActions()
     l.push_front(createSeparator());
 }
 
-QList<QAction*> MdiContainerWidgetTaskMenu::taskActions() const
+QVector<QAction*> MdiContainerWidgetTaskMenu::taskActions() const
 {
     const auto rc = ContainerWidgetTaskMenu::taskActions();
     // Enable
diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h
index b0f4127ee..5a96cf9ac 100644
--- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h
@@ -60,7 +60,7 @@ public:
     ~ContainerWidgetTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void removeCurrentPage();
@@ -69,7 +69,7 @@ private slots:
 
 protected:
     QDesignerContainerExtension *containerExtension() const;
-    QList<QAction*> &containerActions() { return m_taskActions; }
+    QVector<QAction*> &containerActions() { return m_taskActions; }
     int pageCount() const;
 
 private:
@@ -85,7 +85,7 @@ private:
     PromotionTaskMenu *m_pagePromotionTaskMenu;
     QAction *m_pageMenuAction;
     QMenu *m_pageMenu;
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
     QAction *m_actionInsertPageAfter;
     QAction *m_actionInsertPage;
     QAction *m_actionDeletePage;
@@ -99,7 +99,7 @@ class WizardContainerWidgetTaskMenu : public ContainerWidgetTaskMenu {
 public:
     explicit WizardContainerWidgetTaskMenu(QWizard *w, QObject *parent = nullptr);
 
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
     QAction *m_nextAction;
@@ -114,7 +114,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu {
 public:
     explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = nullptr);
 
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 private:
     void initializeActions();
 
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index 3b7629908..c40f77468 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -78,7 +78,7 @@ GroupBoxTaskMenu::GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent)
     m_taskActions.append(sep);
 }
 
-QList<QAction*> GroupBoxTaskMenu::taskActions() const
+QVector<QAction*> GroupBoxTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h
index e09a883a0..d963e44a8 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h
@@ -49,11 +49,11 @@ public:
     explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
     QAction *m_editTitleAction;
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
 };
 
 typedef ExtensionFactory<QDesignerTaskMenuExtension, QGroupBox, GroupBoxTaskMenu>  GroupBoxTaskMenuFactory;
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h
index 97bcb19d9..ebdfa37b4 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.h
+++ b/src/designer/src/components/taskmenu/itemlisteditor.h
@@ -99,8 +99,8 @@ protected:
     DesignerEditorFactory *m_editorFactory;
     QSplitter *m_propertySplitter =  nullptr;
     QtTreePropertyBrowser *m_propertyBrowser;
-    QList<QtVariantProperty*> m_properties;
-    QList<QtVariantProperty*> m_rootProperties;
+    QVector<QtVariantProperty*> m_properties;
+    QVector<QtVariantProperty*> m_rootProperties;
     QHash<QtVariantProperty*, int> m_propertyToRole;
     bool m_updatingBrowser = false;
 };
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index b46a2a64e..c446e5ab1 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -90,7 +90,7 @@ QAction *LabelTaskMenu::preferredEditAction() const
     return Qt::mightBeRichText(m_label->text()) ? m_editRichTextAction : m_editPlainTextAction;
 }
 
-QList<QAction*> LabelTaskMenu::taskActions() const
+QVector<QAction*> LabelTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.h b/src/designer/src/components/taskmenu/label_taskmenu.h
index a1744b583..394243916 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.h
+++ b/src/designer/src/components/taskmenu/label_taskmenu.h
@@ -48,14 +48,14 @@ public:
     explicit LabelTaskMenu(QLabel *button, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void editRichText();
 
 private:
     QLabel *m_label;
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
     QAction *m_editRichTextAction;
     QAction *m_editPlainTextAction;
 };
diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.cpp b/src/designer/src/components/taskmenu/layouttaskmenu.cpp
index b69051212..82a1a9687 100644
--- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp
+++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp
@@ -51,9 +51,9 @@ QAction *LayoutWidgetTaskMenu::preferredEditAction() const
     return m_formLayoutMenu->preferredEditAction(m_widget, m_widget->formWindow());
 }
 
-QList<QAction*> LayoutWidgetTaskMenu::taskActions() const
+QVector<QAction*> LayoutWidgetTaskMenu::taskActions() const
 {
-    QList<QAction*> rc;
+    QVector<QAction*> rc;
     QDesignerFormWindowInterface *fw = m_widget->formWindow();
     m_morphMenu->populate(m_widget, fw, rc);
     m_formLayoutMenu->populate(m_widget, fw, rc);
@@ -71,7 +71,7 @@ QAction *SpacerTaskMenu::preferredEditAction() const
     return nullptr;
 }
 
-QList<QAction*> SpacerTaskMenu::taskActions() const
+QVector<QAction*> SpacerTaskMenu::taskActions() const
 {
     return {};
 }
diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h
index afd1afe0f..523477719 100644
--- a/src/designer/src/components/taskmenu/layouttaskmenu.h
+++ b/src/designer/src/components/taskmenu/layouttaskmenu.h
@@ -51,7 +51,7 @@ public:
     explicit LayoutWidgetTaskMenu(QLayoutWidget *w, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
     QLayoutWidget *m_widget;
@@ -68,7 +68,7 @@ public:
     explicit SpacerTaskMenu(Spacer *bar, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 };
 
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index cbe2f3e2f..5315f59d8 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -80,7 +80,7 @@ QAction *LineEditTaskMenu::preferredEditAction() const
     return m_editTextAction;
 }
 
-QList<QAction*> LineEditTaskMenu::taskActions() const
+QVector<QAction*> LineEditTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.h b/src/designer/src/components/taskmenu/lineedit_taskmenu.h
index e28ab7336..4c67c4884 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h
@@ -46,10 +46,10 @@ public:
     explicit LineEditTaskMenu(QLineEdit *button, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
     QAction *m_editTextAction;
 };
 
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
index 74bff711d..323b3da7a 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
@@ -67,7 +67,7 @@ QAction *ListWidgetTaskMenu::preferredEditAction() const
     return m_editItemsAction;
 }
 
-QList<QAction*> ListWidgetTaskMenu::taskActions() const
+QVector<QAction*> ListWidgetTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.h b/src/designer/src/components/taskmenu/listwidget_taskmenu.h
index 63708be61..f28df59de 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h
@@ -50,7 +50,7 @@ public:
     ~ListWidgetTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void editItems();
@@ -60,7 +60,7 @@ private:
     QListWidget *m_listWidget;
     QPointer<QDesignerFormWindowInterface> m_formWindow;
     QPointer<QLineEdit> m_editor;
-    mutable QList<QAction*> m_taskActions;
+    mutable QVector<QAction*> m_taskActions;
     QAction *m_editItemsAction;
 };
 
diff --git a/src/designer/src/components/taskmenu/menutaskmenu.cpp b/src/designer/src/components/taskmenu/menutaskmenu.cpp
index 105c3eabd..73efae9d2 100644
--- a/src/designer/src/components/taskmenu/menutaskmenu.cpp
+++ b/src/designer/src/components/taskmenu/menutaskmenu.cpp
@@ -51,9 +51,9 @@ namespace qdesigner_internal {
         return nullptr;
     }
 
-    QList<QAction*> MenuTaskMenu::taskActions() const
+    QVector<QAction*> MenuTaskMenu::taskActions() const
     {
-        QList<QAction*> rc;
+        QVector<QAction*> rc;
         rc.push_back(m_removeAction);
         m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc);
         return rc;
@@ -84,7 +84,7 @@ namespace qdesigner_internal {
         return nullptr;
     }
 
-    QList<QAction*> MenuBarTaskMenu::taskActions() const
+    QVector<QAction*> MenuBarTaskMenu::taskActions() const
     {
         return m_bar->contextMenuActions();
     }
diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h
index 935836896..fa9e8ad32 100644
--- a/src/designer/src/components/taskmenu/menutaskmenu.h
+++ b/src/designer/src/components/taskmenu/menutaskmenu.h
@@ -55,7 +55,7 @@ public:
     explicit MenuTaskMenu(QDesignerMenu *menu, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void removeMenu();
@@ -77,7 +77,7 @@ public:
     explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
     QDesignerMenuBar *m_bar;
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
index 25bc6ce40..aad9aede0 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
@@ -66,7 +66,7 @@ QAction *TableWidgetTaskMenu::preferredEditAction() const
     return m_editItemsAction;
 }
 
-QList<QAction*> TableWidgetTaskMenu::taskActions() const
+QVector<QAction*> TableWidgetTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
index b4d5462f2..c68dd4afa 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
@@ -50,7 +50,7 @@ public:
     ~TableWidgetTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void editItems();
@@ -60,7 +60,7 @@ private:
     QTableWidget *m_tableWidget;
     QPointer<QDesignerFormWindowInterface> m_formWindow;
     QPointer<QLineEdit> m_editor;
-    mutable QList<QAction*> m_taskActions;
+    mutable QVector<QAction*> m_taskActions;
     QAction *m_editItemsAction;
 };
 
diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
index ca5d5d526..b2c6f8e10 100644
--- a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
@@ -76,7 +76,7 @@ QAction *TextEditTaskMenu::preferredEditAction() const
     return m_editTextAction;
 }
 
-QList<QAction*> TextEditTaskMenu::taskActions() const
+QVector<QAction*> TextEditTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.h b/src/designer/src/components/taskmenu/textedit_taskmenu.h
index 2e50b8ca1..77517c8da 100644
--- a/src/designer/src/components/taskmenu/textedit_taskmenu.h
+++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h
@@ -51,7 +51,7 @@ public:
     ~TextEditTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void editText();
@@ -63,7 +63,7 @@ private:
     const QString m_property;
     const QString m_windowTitle;
 
-    mutable QList<QAction*> m_taskActions;
+    mutable QVector<QAction*> m_taskActions;
     QAction *m_editTextAction;
 };
 
diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
index 42f3b271a..6ac558546 100644
--- a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
@@ -54,7 +54,7 @@ namespace qdesigner_internal {
         return nullptr;
     }
 
-    QList<QAction*> ToolBarTaskMenu::taskActions() const
+    QVector<QAction*> ToolBarTaskMenu::taskActions() const
     {
         if (ToolBarEventFilter *ef = ToolBarEventFilter::eventFilterOf(m_toolBar))
             return ef->contextMenuActions();
@@ -76,9 +76,9 @@ namespace qdesigner_internal {
         return nullptr;
     }
 
-    QList<QAction*> StatusBarTaskMenu::taskActions() const
+    QVector<QAction*> StatusBarTaskMenu::taskActions() const
     {
-        QList<QAction*> rc;
+        QVector<QAction*> rc;
         rc.push_back(m_removeAction);
         m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc);
         return rc;
diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.h b/src/designer/src/components/taskmenu/toolbar_taskmenu.h
index 3e8d5909b..0c3f5592f 100644
--- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h
+++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h
@@ -50,7 +50,7 @@ public:
     explicit ToolBarTaskMenu(QToolBar *tb, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private:
     QToolBar *m_toolBar;
@@ -65,7 +65,7 @@ public:
     explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = nullptr);
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void removeStatusBar();
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
index c4ffd4ca5..e0c14a4bc 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
@@ -65,7 +65,7 @@ QAction *TreeWidgetTaskMenu::preferredEditAction() const
     return m_editItemsAction;
 }
 
-QList<QAction*> TreeWidgetTaskMenu::taskActions() const
+QVector<QAction*> TreeWidgetTaskMenu::taskActions() const
 {
     return m_taskActions + QDesignerTaskMenu::taskActions();
 }
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.h b/src/designer/src/components/taskmenu/treewidget_taskmenu.h
index 9a9c882df..b64401d76 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h
@@ -50,7 +50,7 @@ public:
     ~TreeWidgetTaskMenu() override;
 
     QAction *preferredEditAction() const override;
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void editItems();
@@ -60,7 +60,7 @@ private:
     QTreeWidget *m_treeWidget;
     QPointer<QDesignerFormWindowInterface> m_formWindow;
     QPointer<QLineEdit> m_editor;
-    mutable QList<QAction*> m_taskActions;
+    mutable QVector<QAction*> m_taskActions;
     QAction *m_editItemsAction;
 };
 
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
index 5e77939e5..8a70a7d33 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -153,7 +153,7 @@ TreeWidgetContents TreeWidgetEditor::fillContentsFromTreeWidget(QTreeWidget *tre
     treeCont.m_headerItem.applyToListWidget(m_columnEditor->listWidget(), iconCache(), true);
     m_columnEditor->setupEditor(treeWidget, treeHeaderPropList);
 
-    QList<QtVariantProperty*> rootProperties;
+    QVector<QtVariantProperty*> rootProperties;
     rootProperties.append(setupPropertyGroup(tr("Per column properties"), treeItemColumnPropList));
     rootProperties.append(setupPropertyGroup(tr("Common properties"), treeItemCommonPropList));
     m_rootProperties = rootProperties;
@@ -498,7 +498,7 @@ void TreeWidgetEditor::moveColumnItems(const PropertyDefinition *propList,
 {
     BoolBlocker block(m_updatingBrowser);
 
-    QList<QVariant> saveCol;
+    QVector<QVariant> saveCol;
     for (int j = 0; propList[j].name; j++)
         saveCol.append(item->data(toColumn, propList[j].role));
     QVariant editVariant = item->data(toColumn, Qt::EditRole);
diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp
index 4415c4dbe..70c5923aa 100644
--- a/src/designer/src/components/widgetbox/widgetbox.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox.cpp
@@ -132,7 +132,7 @@ void WidgetBox::handleMousePress(const QString &name, const QString &xml, const
     DomUI *ui = xmlToUi(name, xml, true);
     if (ui == nullptr)
         return;
-    QList<QDesignerDnDItemInterface*> item_list;
+    QVector<QDesignerDnDItemInterface*> item_list;
     item_list.append(new WidgetBoxDnDItem(core(), ui, global_mouse_pos));
     m_core->formWindowManager()->dragItems(item_list);
 }
@@ -177,7 +177,7 @@ void WidgetBox::removeWidget(int cat_idx, int wgt_idx)
     m_view->removeWidget(cat_idx, wgt_idx);
 }
 
-void WidgetBox::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint&)
+void WidgetBox::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint&)
 {
     m_view->dropWidgets(item_list);
 }
diff --git a/src/designer/src/components/widgetbox/widgetbox.h b/src/designer/src/components/widgetbox/widgetbox.h
index 27e1b461a..aa687498e 100644
--- a/src/designer/src/components/widgetbox/widgetbox.h
+++ b/src/designer/src/components/widgetbox/widgetbox.h
@@ -61,7 +61,7 @@ public:
     void addWidget(int cat_idx, const Widget &wgt) override;
     void removeWidget(int cat_idx, int wgt_idx) override;
 
-    void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override;
+    void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override;
 
     void setFileName(const QString &file_name) override;
     QString fileName() const override;
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h
index 657dad148..16e651dc2 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h
@@ -58,7 +58,7 @@ public:
     explicit WidgetBoxCategoryListView(QDesignerFormEditorInterface *core, QWidget *parent = nullptr);
     void setViewMode(ViewMode vm);
 
-    void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list);
+    void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list);
 
     using QListView::contentsSize;
 
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 054d622a0..fc28aa222 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -900,7 +900,7 @@ void WidgetBoxTreeWidget::contextMenuEvent(QContextMenuEvent *e)
     menu.exec(mapToGlobal(e->pos()));
 }
 
-void WidgetBoxTreeWidget::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list)
+void WidgetBoxTreeWidget::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list)
 {
     QTreeWidgetItem *scratch_item = nullptr;
     WidgetBoxCategoryListView *categoryView = nullptr;
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h
index 0961e658d..2262b50bd 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h
@@ -72,7 +72,7 @@ public:
     void addWidget(int cat_idx, const Widget &wgt);
     void removeWidget(int cat_idx, int wgt_idx);
 
-    void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list);
+    void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list);
 
     void setFileName(const QString &file_name);
     QString fileName() const;