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

ClangTools: Prepare for more ClangToolRunners

Browse Source 
Change-Id: I6bbdbff496c0604367896d279df1a197f8a041bd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-08-01 14:54:15 +02:00
parent a4022c6156
commit 217332a48f
5 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -58,16 +58,12 @@ QString finishedWithBadExitCode(const QString &name, int exitCode)
return ClangToolRunner::tr("%1 finished with exit code: %2.").arg(name).arg(exitCode);
}
ClangToolRunner::ClangToolRunner(const QString &clangExecutable,
const QString &clangLogFileDir,
const Utils::Environment &environment,
const QString &name,
QObject *parent)
: QObject(parent)
, m_clangExecutable(QDir::toNativeSeparators(clangExecutable))
, m_clangLogFileDir(clangLogFileDir)
, m_name(name)
void ClangToolRunner::init(const QString &clangExecutable,
const QString &clangLogFileDir,
const Utils::Environment &environment)
{
m_clangExecutable = QDir::toNativeSeparators(clangExecutable);
m_clangLogFileDir = clangLogFileDir;
QTC_CHECK(!m_clangExecutable.isEmpty());
QTC_CHECK(!m_clangLogFileDir.isEmpty());
@@ -97,7 +93,7 @@ bool ClangToolRunner::run(const QString &filePath, const QStringList &compilerOp
m_logFile = createLogFile(filePath);
QTC_ASSERT(!m_logFile.isEmpty(), return false);
const QStringList arguments = constructCommandLineArguments(compilerOptions);
const QStringList arguments = m_argsCreator(compilerOptions);
m_commandLine = Utils::QtcProcess::joinArgs(QStringList(m_clangExecutable) + arguments);
qCDebug(LOG).noquote() << "Starting" << m_commandLine;