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

Pass C or Cxx toolchain to code model

Browse Source 
Pass the C toolChain to the code model for all the C-versions creator
supports.

Change-Id: I0300a19d35861fcee76fb92ce14c6e04996bac7f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-07-13 10:00:43 +02:00
parent abcb276453
commit 7ab2ed5730
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cpptools/projectpartbuilder.cpp
View File

@@ -361,9 +361,16 @@ void ProjectPartBuilder::createProjectPart(const QVector<ProjectFile> &theSource
QTC_ASSERT(part->project, return);
if (ProjectExplorer::Target *activeTarget = part->project->activeTarget()) {
if (ProjectExplorer::Kit *kit = activeTarget->kit()) {
if (ProjectExplorer::ToolChain *toolChain = ProjectExplorer::ToolChainKitInformation::toolChain(kit, ProjectExplorer::ToolChain::Language::Cxx)) {
const QStringList flags = languageVersion >= ProjectPart::CXX98 ? m_cxxFlags
: m_cFlags;
ProjectExplorer::ToolChain *toolChain = nullptr;
if (languageVersion < ProjectPart::CXX98)
toolChain = ProjectExplorer::ToolChainKitInformation::toolChain(kit, ProjectExplorer::ToolChain::Language::C);
if (!toolChain) // Use Cxx toolchain for C projects without C compiler in kit and for C++ code
toolChain = ProjectExplorer::ToolChainKitInformation::toolChain(kit, ProjectExplorer::ToolChain::Language::Cxx);
if (toolChain) {
const QStringList flags
= (toolChain->language() == ProjectExplorer::ToolChain::Language::Cxx)
? m_cxxFlags : m_cFlags;
evaluateProjectPartToolchain(part.data(),
toolChain,
flags,