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

RunControl: Pass on toolchain defines and language options

Browse Source 
Change-Id: I3a44707f7f27e1b4bb781886b63b23a3c20e0414
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-10-23 15:31:35 +02:00
parent 8cca190dfc
commit 3f8314024c
4 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp
View File

@@ -40,14 +40,14 @@ static QString finishedDueToCrash()
static QStringList constructCommandLineArguments(const QString &filePath,
const QString &logFile,
const QStringList &definesAndIncludes)
const QStringList &options)
{
QStringList arguments = QStringList()
<< QLatin1String("--analyze")
<< QLatin1String("-o")
<< logFile
;
arguments += definesAndIncludes;
arguments += options;
arguments << filePath;
return arguments;
}
@@ -88,16 +88,18 @@ ClangStaticAnalyzerRunner::~ClangStaticAnalyzerRunner()
m_process.kill();
}
bool ClangStaticAnalyzerRunner::run(const QString &filePath, const QStringList &definesAndIncludes)
bool ClangStaticAnalyzerRunner::run(const QString &filePath, const QStringList &compilerOptions)
{
QTC_ASSERT(!m_clangExecutable.isEmpty(), return false);
QTC_CHECK(!compilerOptions.contains(QLatin1String("-o")));
QTC_CHECK(!compilerOptions.contains(filePath));
m_processOutput.clear();
m_logFile = createLogFile(filePath);
QTC_ASSERT(!m_logFile.isEmpty(), return false);
const QStringList arguments = constructCommandLineArguments(filePath, m_logFile,
definesAndIncludes);
compilerOptions);
m_commandLine = m_clangExecutable + QLatin1Char(' ') + arguments.join(QLatin1Char(' '));
qCDebug(LOG) << "Starting" << m_commandLine;