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

Valgrind: Inline ValgrindToolRunner::executable

Browse Source 
Change-Id: Ia714a5a322ae56b07360871f584ec6f9f1babb5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-05-31 09:17:50 +02:00
parent 6431b02947
commit 1976630bbc
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@
#include "callgrindengine.h" #include "callgrindengine.h"
#include "callgrindtool.h"
#include "valgrindsettings.h" #include "valgrindsettings.h"
#include <valgrind/callgrind/callgrindcontroller.h> #include <valgrind/callgrind/callgrindcontroller.h>
@@ -105,7 +104,7 @@ QStringList CallgrindToolRunner::toolArguments() const
arguments << "--callgrind-out-file=" + m_valgrindOutputFile.path(); arguments << "--callgrind-out-file=" + m_valgrindOutputFile.path();
arguments << Utils::ProcessArgs::splitArgs(m_settings.callgrindArguments.value()); arguments << ProcessArgs::splitArgs(m_settings.callgrindArguments.value());
return arguments; return arguments;
} }
@@ -117,7 +116,8 @@ QString CallgrindToolRunner::progressTitle() const
void CallgrindToolRunner::start() void CallgrindToolRunner::start()
{ {
appendMessage(tr("Profiling %1").arg(executable().toUserOutput()), Utils::NormalMessageFormat); const FilePath executable = runControl()->commandLine().executable();
appendMessage(tr("Profiling %1").arg(executable.toUserOutput()), NormalMessageFormat);
return ValgrindToolRunner::start(); return ValgrindToolRunner::start();
} }

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

@@ -1008,7 +1008,7 @@ void MemcheckToolPrivate::setupRunner(MemcheckToolRunner *runTool)
m_loadExternalLogFile->setDisabled(true); m_loadExternalLogFile->setDisabled(true);
const FilePath dir = runControl->project()->projectDirectory(); const FilePath dir = runControl->project()->projectDirectory();
const QString name = runTool->executable().fileName(); const QString name = runControl->commandLine().executable().fileName();
m_errorView->setDefaultSuppressionFile(dir.pathAppended(name + ".supp")); m_errorView->setDefaultSuppressionFile(dir.pathAppended(name + ".supp"));

5
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -122,11 +122,6 @@ void ValgrindToolRunner::stop()
m_runner.stop(); m_runner.stop();
} }
FilePath ValgrindToolRunner::executable() const
{
return runControl()->commandLine().executable();
}
QStringList ValgrindToolRunner::genericToolArguments() const QStringList ValgrindToolRunner::genericToolArguments() const
{ {
QString smcCheckValue; QString smcCheckValue;

2
src/plugins/valgrind/valgrindengine.h
View File

@@ -47,8 +47,6 @@ public:
void start() override; void start() override;
void stop() override; void stop() override;
Utils::FilePath executable() const;
protected: protected:
virtual QString progressTitle() const = 0; virtual QString progressTitle() const = 0;
virtual QStringList toolArguments() const = 0; virtual QStringList toolArguments() const = 0;