feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
This commit is contained in:
Eike Ziller
2016-04-22 15:13:58 +02:00
parent 582c46d34f 427bb8c363
commit 4a826ada04
83 changed files with 417 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -370,7 +370,7 @@ CallgrindTool::CallgrindTool(QObject *parent)
// pause action
m_pauseAction = action = new QAction(this);
action->setCheckable(true);
action->setIcon(Core::Icons::INTERRUPT_SMALL.icon());
action->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon());
//action->setText(tr("Ignore"));
action->setToolTip(tr("Pause event logging. No events are counted which will speed up program execution during profiling."));
connect(action, &QAction::toggled, this, &CallgrindTool::pauseToggled);
@@ -379,14 +379,14 @@ CallgrindTool::CallgrindTool(QObject *parent)
// go back
m_goBack = action = new QAction(this);
action->setDisabled(true);
action->setIcon(Core::Icons::PREV.icon());
action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
action->setToolTip(tr("Go back one step in history. This will select the previously selected item."));
connect(action, &QAction::triggered, &m_stackBrowser, &StackBrowser::goBack);
// go forward
m_goNext = action = new QAction(this);
action->setDisabled(true);
action->setIcon(Core::Icons::NEXT.icon());
action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
action->setToolTip(tr("Go forward one step in history."));
connect(action, &QAction::triggered, &m_stackBrowser, &StackBrowser::goNext);

4
src/plugins/valgrind/memchecktool.cpp
View File

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