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

 Conflicts:
	dependencies.yaml

Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8

3 files changed, 4 insertions, 4 deletions

diff --git a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
index 299fb466c..989c47482 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
+++ b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
@@ -65,7 +65,7 @@ bool QAxWidgetExtraInfo::saveWidgetExtraInfo(DomWidget *ui_widget)
     /* Turn off standard setters and make sure "control" is in front,
      * otherwise, previews will not work as the properties are not applied via
      * the caching property sheet, them. */
-    typedef QList<DomProperty *> DomPropertyList;
+    typedef QVector<DomProperty *> DomPropertyList;
     DomPropertyList props = ui_widget->elementProperty();
     const int size = props.size();
     const QString controlProperty = QLatin1String(QAxWidgetPropertySheet::controlPropertyName);
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
index 4e34f3872..bcf792771 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
@@ -117,7 +117,7 @@ QAxWidgetTaskMenu::~QAxWidgetTaskMenu()
 {
 }
 
-QList<QAction*> QAxWidgetTaskMenu::taskActions() const
+QVector<QAction*> QAxWidgetTaskMenu::taskActions() const
 {
     const bool loaded = m_axwidget->loaded();
     m_setAction->setEnabled(!loaded);
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
index e1cf40af6..02bc4b8b6 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
@@ -43,7 +43,7 @@ class QAxWidgetTaskMenu: public QObject, public QDesignerTaskMenuExtension
 public:
     explicit QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent = 0);
     virtual ~QAxWidgetTaskMenu();
-    QList<QAction*> taskActions() const override;
+    QVector<QAction*> taskActions() const override;
 
 private slots:
     void setActiveXControl();
@@ -53,7 +53,7 @@ private:
     QDesignerAxWidget *m_axwidget;
     QAction *m_setAction;
     QAction *m_resetAction;
-    QList<QAction*> m_taskActions;
+    QVector<QAction*> m_taskActions;
 };
 
 typedef qdesigner_internal::ExtensionFactory<QDesignerTaskMenuExtension, QDesignerAxWidget, QAxWidgetTaskMenu>  ActiveXTaskMenuFactory;