forked from qt-creator/qt-creator
Pass C or Cxx toolchain to code model
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:
@@ -361,9 +361,16 @@ void ProjectPartBuilder::createProjectPart(const QVector<ProjectFile> &theSource
|
|||||||
QTC_ASSERT(part->project, return);
|
QTC_ASSERT(part->project, return);
|
||||||
if (ProjectExplorer::Target *activeTarget = part->project->activeTarget()) {
|
if (ProjectExplorer::Target *activeTarget = part->project->activeTarget()) {
|
||||||
if (ProjectExplorer::Kit *kit = activeTarget->kit()) {
|
if (ProjectExplorer::Kit *kit = activeTarget->kit()) {
|
||||||
if (ProjectExplorer::ToolChain *toolChain = ProjectExplorer::ToolChainKitInformation::toolChain(kit, ProjectExplorer::ToolChain::Language::Cxx)) {
|
ProjectExplorer::ToolChain *toolChain = nullptr;
|
||||||
const QStringList flags = languageVersion >= ProjectPart::CXX98 ? m_cxxFlags
|
if (languageVersion < ProjectPart::CXX98)
|
||||||
: m_cFlags;
|
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(),
|
evaluateProjectPartToolchain(part.data(),
|
||||||
toolChain,
|
toolChain,
|
||||||
flags,
|
flags,
|
||||||
|
|||||||
Reference in New Issue
Block a user