diff options
Diffstat (limited to 'src/plugins/clangtools')
| -rw-r--r-- | src/plugins/clangtools/clangtool.cpp | 19 | ||||
| -rw-r--r-- | src/plugins/clangtools/documentclangtoolrunner.cpp | 6 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 5ca9f0816a6..acd30e5ece7 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -841,7 +841,7 @@ void ClangTool::startTool(FileSelection fileSelection, const RunSettings &runSet QTC_ASSERT(project->activeTarget(), return); // Continue despite release mode? - if (BuildConfiguration *bc = project->activeTarget()->activeBuildConfiguration()) { + if (BuildConfiguration *bc = project->activeBuildConfiguration()) { if (bc->buildType() == BuildConfiguration::Release) if (!continueDespiteReleaseBuild(m_name)) return; @@ -1032,16 +1032,13 @@ void ClangTool::reset() static bool canAnalyzeProject(Project *project) { - if (const Target *target = project->activeTarget()) { - const Id c = ProjectExplorer::Constants::C_LANGUAGE_ID; - const Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID; - const bool projectSupportsLanguage = project->projectLanguages().contains(c) - || project->projectLanguages().contains(cxx); - return projectSupportsLanguage - && CppModelManager::projectInfo(project) - && ToolchainKitAspect::cxxToolchain(target->kit()); - } - return false; + const Id c = ProjectExplorer::Constants::C_LANGUAGE_ID; + const Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID; + const bool projectSupportsLanguage = project->projectLanguages().contains(c) + || project->projectLanguages().contains(cxx); + return projectSupportsLanguage + && CppModelManager::projectInfo(project) + && ToolchainKitAspect::cxxToolchain(project->activeKit()); } struct CheckResult { diff --git a/src/plugins/clangtools/documentclangtoolrunner.cpp b/src/plugins/clangtools/documentclangtoolrunner.cpp index 093df0ab7b0..c1847e71e63 100644 --- a/src/plugins/clangtools/documentclangtoolrunner.cpp +++ b/src/plugins/clangtools/documentclangtoolrunner.cpp @@ -148,10 +148,8 @@ static FileInfo getFileInfo(const FilePath &file, Project *project) static Environment projectBuildEnvironment(Project *project) { Environment env; - if (Target *target = project->activeTarget()) { - if (BuildConfiguration *buildConfig = target->activeBuildConfiguration()) - env = buildConfig->environment(); - } + if (BuildConfiguration *buildConfig = project->activeBuildConfiguration()) + env = buildConfig->environment(); if (!env.hasChanges()) env = Environment::systemEnvironment(); return env; |