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

Complete the Language change for QNX

Browse Source 
The QNX configuration code needs to indicate that it's creating C++ tool
chains and (for now) indicate that it isn't setting a C tool chain for
the kit(s) that it creates.

Change-Id: Ied50bec3624e768896b109f9fbd4bffd4581d428
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
James McDonnell
2016-11-24 16:42:46 -05:00
committed by Tobias Hunger
parent 57ca90b846
commit 090556e5dd
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnxconfiguration.cpp
View File

@@ -295,6 +295,7 @@ QnxToolChain *QnxConfiguration::createToolChain(QnxArchitecture arch, const QStr
{
QnxToolChain *toolChain = new QnxToolChain(ToolChain::AutoDetection);
toolChain->resetToolChain(m_qccCompiler);
toolChain->setLanguage(ToolChain::Language::Cxx);
toolChain->setTargetAbi(Abi((arch == Qnx::ArmLeV7) ? Abi::ArmArchitecture : Abi::X86Architecture,
Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 32));
toolChain->setDisplayName(displayName);
@@ -317,6 +318,7 @@ Kit *QnxConfiguration::createKit(QnxArchitecture arch,
QtKitInformation::setQtVersion(kit, qnxQt);
ToolChainKitInformation::setToolChain(kit, toolChain);
ToolChainKitInformation::setToolChain(kit, ToolChain::Language::C, nullptr);
if (debuggerItemId.isValid())
DebuggerKitInformation::setDebugger(kit, debuggerItemId);