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
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
This commit is contained in:
Oswald Buddenhagen
2016-04-01 17:31:39 +02:00
parent 26e51ff633 ea1f5d2b6c
commit e426d08e54
143 changed files with 6586 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,7 +412,6 @@ CallgrindTool::CallgrindTool(QObject *parent)
// Cost formatting
{
auto menu = new QMenu;
auto group = new QActionGroup(this);
// Show costs as absolute numbers
@@ -422,7 +421,6 @@ CallgrindTool::CallgrindTool(QObject *parent)
m_costAbsolute->setChecked(true);
connect(m_costAbsolute, &QAction::toggled, this, &CallgrindTool::updateCostFormat);
group->addAction(m_costAbsolute);
menu->addAction(m_costAbsolute);
// Show costs in percentages
m_costRelative = new QAction(tr("Relative Costs"), this);
@@ -430,7 +428,6 @@ CallgrindTool::CallgrindTool(QObject *parent)
m_costRelative->setCheckable(true);
connect(m_costRelative, &QAction::toggled, this, &CallgrindTool::updateCostFormat);
group->addAction(m_costRelative);
menu->addAction(m_costRelative);
// Show costs relative to parent
m_costRelativeToParent = new QAction(tr("Relative Costs to Parent"), this);
@@ -438,10 +435,9 @@ CallgrindTool::CallgrindTool(QObject *parent)
m_costRelativeToParent->setCheckable(true);
connect(m_costRelativeToParent, &QAction::toggled, this, &CallgrindTool::updateCostFormat);
group->addAction(m_costRelativeToParent);
menu->addAction(m_costRelativeToParent);
auto button = new QToolButton;
button->setMenu(menu);
button->addActions(group->actions());
button->setPopupMode(QToolButton::InstantPopup);
button->setText(QLatin1String("$"));
button->setToolTip(tr("Cost Format"));
@@ -503,7 +499,6 @@ CallgrindTool::CallgrindTool(QObject *parent)
CallgrindTool::~CallgrindTool()
{
qDeleteAll(m_textMarks);
doClear(false);
}
void CallgrindTool::slotGoToOverview()

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

@@ -249,8 +249,6 @@ class MemcheckTool : public QObject
public:
MemcheckTool(QObject *parent);
void createWidgets();
MemcheckRunControl *createRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
Core::Id runMode);