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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
This commit is contained in:
Oswald Buddenhagen
2014-08-05 14:24:23 +02:00
parent 59b34b6b53 b2ac3fd90c
commit f3a61e8bf7
239 changed files with 3370 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -588,12 +588,14 @@ QWidget *CallgrindToolPrivate::createWidgets()
m_visualisation = new Visualisation(mw);
m_visualisation->setFrameStyle(QFrame::NoFrame);
m_visualisation->setObjectName(QLatin1String("Valgrind.CallgrindTool.Visualisation"));
m_visualisation->setWindowTitle(tr("Visualization"));
m_visualisation->setModel(m_dataModel);
connect(m_visualisation, SIGNAL(functionActivated(const Valgrind::Callgrind::Function*)),
this, SLOT(visualisationFunctionSelected(const Valgrind::Callgrind::Function*)));
m_callersView = new CostView(mw);
m_callersView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CallersView"));
m_callersView->setWindowTitle(tr("Callers"));
m_callersView->setSettings(coreSettings, "Valgrind.CallgrindTool.CallersView");
m_callersView->sortByColumn(CallModel::CostColumn);
m_callersView->setFrameStyle(QFrame::NoFrame);
@@ -607,6 +609,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
m_calleesView = new CostView(mw);
m_calleesView->setObjectName(QLatin1String("Valgrind.CallgrindTool.CalleesView"));
m_calleesView->setWindowTitle(tr("Callees"));
m_calleesView->setSettings(coreSettings, "Valgrind.CallgrindTool.CalleesView");
m_calleesView->sortByColumn(CallModel::CostColumn);
m_calleesView->setFrameStyle(QFrame::NoFrame);
@@ -620,6 +623,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
m_flatView = new CostView(mw);
m_flatView->setObjectName(QLatin1String("Valgrind.CallgrindTool.FlatView"));
m_flatView->setWindowTitle(tr("Functions"));
m_flatView->setSettings(coreSettings, "Valgrind.CallgrindTool.FlatView");
m_flatView->sortByColumn(DataModel::SelfCostColumn);
m_flatView->setFrameStyle(QFrame::NoFrame);
@@ -630,17 +634,11 @@ QWidget *CallgrindToolPrivate::createWidgets()
updateCostFormat();
QDockWidget *callersDock = AnalyzerManager::createDockWidget
(q, tr("Callers"), m_callersView, Qt::BottomDockWidgetArea);
QDockWidget *flatDock = AnalyzerManager::createDockWidget
(q, tr("Functions"), m_flatView, Qt::BottomDockWidgetArea);
QDockWidget *calleesDock = AnalyzerManager::createDockWidget
(q, tr("Callees"), m_calleesView, Qt::BottomDockWidgetArea);
QDockWidget *callersDock = AnalyzerManager::createDockWidget(q, m_callersView);
QDockWidget *flatDock = AnalyzerManager::createDockWidget(q, m_flatView);
QDockWidget *calleesDock = AnalyzerManager::createDockWidget(q, m_calleesView);
QDockWidget *visualizationDock = AnalyzerManager::createDockWidget
(q, tr("Visualization"), m_visualisation, Qt::RightDockWidgetArea);
(q, m_visualisation, Qt::RightDockWidgetArea);
callersDock->show();
calleesDock->show();

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

@@ -357,9 +357,9 @@ QWidget *MemcheckTool::createWidgets()
m_errorView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
m_errorView->setAutoScroll(false);
m_errorView->setObjectName(QLatin1String("Valgrind.MemcheckTool.ErrorView"));
m_errorView->setWindowTitle(tr("Memory Issues"));
QDockWidget *errorDock = AnalyzerManager::createDockWidget
(this, tr("Memory Issues"), m_errorView, Qt::BottomDockWidgetArea);
QDockWidget *errorDock = AnalyzerManager::createDockWidget(this, m_errorView);
errorDock->show();
mw->splitDockWidget(mw->toolBarDockWidget(), errorDock, Qt::Vertical);