1 files changed, 8 insertions, 7 deletions
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 2d91a5f00..6162d02e2 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -107,7 +107,7 @@ void ActionModel::update(int row)
     for (int i = 0; i < NumColumns; i++)
        list += item(row, i);
 
-    setItems(m_core, actionOfItem(list.front()), m_emptyIcon, list);
+    setItems(m_core, actionOfItem(list.constFirst()), m_emptyIcon, list);
 }
 
 void ActionModel::remove(int row)
@@ -132,7 +132,7 @@ QModelIndex ActionModel::addAction(QAction *action)
     }
     setItems(m_core, action, m_emptyIcon, items);
     appendRow(items);
-    return indexFromItem(items.front());
+    return indexFromItem(items.constFirst());
 }
 
 // Find the associated menus and toolbars, ignore toolbuttons
@@ -190,7 +190,7 @@ void  ActionModel::setItems(QDesignerFormEditorInterface *core, QAction *action,
     item->setWhatsThis(firstTooltip);
     // Used
     const QWidgetList associatedDesignerWidgets = associatedWidgets(action);
-    const bool used = !associatedDesignerWidgets.empty();
+    const bool used = !associatedDesignerWidgets.isEmpty();
     item = sl[UsedColumn];
     item->setCheckState(used ? Qt::Checked : Qt::Unchecked);
     if (used) {
@@ -308,14 +308,14 @@ static void handleImageDropEvent(const QAbstractItemView *iv, QDropEvent *event,
 
 void startActionDrag(QWidget *dragParent, ActionModel *model, const QModelIndexList &indexes, Qt::DropActions supportedActions)
 {
-    if (indexes.empty())
+    if (indexes.isEmpty())
         return;
 
     QDrag *drag = new QDrag(dragParent);
     QMimeData *data = model->mimeData(indexes);
     drag->setMimeData(data);
     if (ActionRepositoryMimeData *actionMimeData = qobject_cast<ActionRepositoryMimeData *>(data))
-        drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(actionMimeData->actionList().front()));
+        drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(actionMimeData->actionList().constFirst()));
 
     drag->exec(supportedActions);
 }
@@ -392,7 +392,7 @@ void ActionTreeView::currentChanged(const QModelIndex &current, const QModelInde
 
 void ActionTreeView::slotActivated(const QModelIndex &index)
 {
-    emit actionActivated(m_model->actionAt(index));
+    emit actionActivated(m_model->actionAt(index), index.column());
 }
 
 void ActionTreeView::startDrag(Qt::DropActions supportedActions)
@@ -499,7 +499,8 @@ ActionView::ActionView(QWidget *parent) :
 
     // make it possible for vs integration to reimplement edit action dialog
     // [which it shouldn't do actually]
-    connect(m_actionListView, &ActionListView::actionActivated, this, &ActionView::activated);
+    connect(m_actionListView, &ActionListView::actionActivated,
+            this, [this](QAction *a) { this->activated(a, -1); });
     connect(m_actionTreeView, &ActionTreeView::actionActivated, this, &ActionView::activated);
 
     connect(m_actionListView, &ActionListView::currentActionChanged,