diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
commit | 4a826ada0486dd2c07b3932c6e62ad375f0edfbb (patch) | |
tree | 39360b652210c9d92506fe0c0170f8e45a91b159 /src/plugins/valgrind/memchecktool.cpp | |
parent | 582c46d34f28f9e04af4d8179f455a603ded5ec7 (diff) | |
parent | 427bb8c363fc3ee0d9c12ca7ac01d47dc0f6f8f4 (diff) |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
Diffstat (limited to 'src/plugins/valgrind/memchecktool.cpp')
-rw-r--r-- | src/plugins/valgrind/memchecktool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 5ed8152098..7d97c948ae 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -355,7 +355,7 @@ MemcheckTool::MemcheckTool(QObject *parent) // Go to previous leak. action = new QAction(this); action->setDisabled(true); - action->setIcon(Core::Icons::PREV.icon()); + action->setIcon(Core::Icons::PREV_TOOLBAR.icon()); action->setToolTip(tr("Go to previous leak.")); connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goBack); m_goBack = action; @@ -363,7 +363,7 @@ MemcheckTool::MemcheckTool(QObject *parent) // Go to next leak. action = new QAction(this); action->setDisabled(true); - action->setIcon(Core::Icons::NEXT.icon()); + action->setIcon(Core::Icons::NEXT_TOOLBAR.icon()); action->setToolTip(tr("Go to next leak.")); connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goNext); m_goNext = action; |