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

 Conflicts:
	dependencies.yaml

Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8

1 files changed, 2 insertions, 2 deletions

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);