From a6683575c4a0bbf30d74778b554cb144b4b816b2 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 23 May 2016 14:15:06 +0200 Subject: Icons: Move "next/prev", "[un]locked" and "zoom" from Core to Utils They are needed in the timeline view. The change in qtcreator-project.qdocconf makes sure that qdoc still finds the referenced icons. Change-Id: I812fba8e57d06d93efc00c295467c83c08cd1784 Reviewed-by: Leena Miettinen Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/outputpanemanager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/plugins/coreplugin/outputpanemanager.cpp') diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index b7f372ed12..07e234fbf9 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -47,6 +47,7 @@ #include #include #include +#include #include @@ -146,12 +147,12 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage); m_nextAction = new QAction(this); - m_nextAction->setIcon(Icons::NEXT.icon()); + m_nextAction->setIcon(Utils::Icons::NEXT.icon()); m_nextAction->setText(tr("Next Item")); connect(m_nextAction, &QAction::triggered, this, &OutputPaneManager::slotNext); m_prevAction = new QAction(this); - m_prevAction->setIcon(Icons::PREV.icon()); + m_prevAction->setIcon(Utils::Icons::PREV.icon()); m_prevAction->setText(tr("Previous Item")); connect(m_prevAction, &QAction::triggered, this, &OutputPaneManager::slotPrev); @@ -234,12 +235,12 @@ void OutputPaneManager::init() cmd = ActionManager::registerAction(m_prevAction, "Coreplugin.OutputPane.previtem"); cmd->setDefaultKeySequence(QKeySequence(tr("Shift+F6"))); m_prevToolButton->setDefaultAction( - ProxyAction::proxyActionWithIcon(cmd->action(), Icons::PREV_TOOLBAR.icon())); + ProxyAction::proxyActionWithIcon(cmd->action(), Utils::Icons::PREV_TOOLBAR.icon())); mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup"); cmd = ActionManager::registerAction(m_nextAction, "Coreplugin.OutputPane.nextitem"); m_nextToolButton->setDefaultAction( - ProxyAction::proxyActionWithIcon(cmd->action(), Icons::NEXT_TOOLBAR.icon())); + ProxyAction::proxyActionWithIcon(cmd->action(), Utils::Icons::NEXT_TOOLBAR.icon())); cmd->setDefaultKeySequence(QKeySequence(tr("F6"))); mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup"); -- cgit v1.2.1