summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/outputpanemanager.cpp
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-05-23 14:15:06 +0200
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-05-31 08:51:12 +0000
commita6683575c4a0bbf30d74778b554cb144b4b816b2 (patch)
tree37feae65098c1ac4cb3f31068dbadd7e58730892 /src/plugins/coreplugin/outputpanemanager.cpp
parentbb0a96a1bad1053a5b69eb6728213b055016b697 (diff)
downloadqt-creator-a6683575c4a0bbf30d74778b554cb144b4b816b2.tar.gz
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 <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/outputpanemanager.cpp')
-rw-r--r--src/plugins/coreplugin/outputpanemanager.cpp9
1 files changed, 5 insertions, 4 deletions
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 <utils/proxyaction.h>
#include <utils/qtcassert.h>
#include <utils/theme/theme.h>
+#include <utils/utilsicons.h>
#include <QDebug>
@@ -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");