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

RunControl: Use the project from the RunConfiguration

Browse Source 
Change-Id: I9f9214bc82e9d3ebecb3974ff5197f4af885fa07
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-10-24 10:21:32 +02:00
parent 3f8314024c
commit a8f06e858f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -34,8 +34,8 @@
#include <cpptools/cppprojects.h> #include <cpptools/cppprojects.h>
#include <cpptools/cppprojectfile.h> #include <cpptools/cppprojectfile.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/target.h>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QTemporaryDir> #include <QTemporaryDir>
@@ -84,8 +84,12 @@ bool ClangStaticAnalyzerRunControl::startEngine()
{ {
emit starting(this); emit starting(this);
Project *currentProject = ProjectExplorerPlugin::currentProject(); RunConfiguration *runConfig = runConfiguration();
QTC_ASSERT(currentProject, emit finished(); return false); QTC_ASSERT(runConfig, emit finished(); return false);
Target *target = runConfig->target();
QTC_ASSERT(target, emit finished(); return false);
Project *project = target->project();
QTC_ASSERT(project, emit finished(); return false);
// Check clang executable // Check clang executable
bool isValidClangExecutable; bool isValidClangExecutable;
@@ -111,7 +115,7 @@ bool ClangStaticAnalyzerRunControl::startEngine()
m_clangLogFileDir = temporaryDir.path(); m_clangLogFileDir = temporaryDir.path();
// Collect files // Collect files
const QList<SourceFileConfiguration> filesToProcess = calculateFilesToProcess(currentProject); const QList<SourceFileConfiguration> filesToProcess = calculateFilesToProcess(project);
qCDebug(LOG()) << "Files to process:"; qCDebug(LOG()) << "Files to process:";
foreach (const SourceFileConfiguration &fileConfig, filesToProcess) { foreach (const SourceFileConfiguration &fileConfig, filesToProcess) {
qCDebug(LOG()) << fileConfig.file.path + QLatin1String(" [") qCDebug(LOG()) << fileConfig.file.path + QLatin1String(" [")