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

BareMetal: Save 'platform codegen flags' for Keil compiler

Browse Source 
Previous commit 071f998 skipped {re}storing of the platform
codegen flags in the Keil compiler.

Change-Id: I483f92a15017ba0471691d25685a2a8e9bd7d93c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2020-05-19 18:00:39 +03:00
parent fdfa68cc7a
commit 29a67b57e5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/baremetal/keiltoolchain.cpp
View File

@@ -61,6 +61,7 @@ namespace Internal {
// Helpers: // Helpers:
static const char compilerCommandKeyC[] = "BareMetal.KeilToolchain.CompilerPath"; static const char compilerCommandKeyC[] = "BareMetal.KeilToolchain.CompilerPath";
static const char compilerPlatformCodeGenFlagsKeyC[] = "BareMetal.KeilToolchain.PlatformCodeGenFlags";
static const char targetAbiKeyC[] = "BareMetal.KeilToolchain.TargetAbi"; static const char targetAbiKeyC[] = "BareMetal.KeilToolchain.TargetAbi";
static bool compilerExists(const FilePath &compilerPath) static bool compilerExists(const FilePath &compilerPath)
@@ -534,6 +535,7 @@ QVariantMap KeilToolChain::toMap() const
{ {
QVariantMap data = ToolChain::toMap(); QVariantMap data = ToolChain::toMap();
data.insert(compilerCommandKeyC, m_compilerCommand.toString()); data.insert(compilerCommandKeyC, m_compilerCommand.toString());
data.insert(compilerPlatformCodeGenFlagsKeyC, m_extraCodeModelFlags);
data.insert(targetAbiKeyC, m_targetAbi.toString()); data.insert(targetAbiKeyC, m_targetAbi.toString());
return data; return data;
} }
@@ -543,6 +545,7 @@ bool KeilToolChain::fromMap(const QVariantMap &data)
if (!ToolChain::fromMap(data)) if (!ToolChain::fromMap(data))
return false; return false;
m_compilerCommand = FilePath::fromString(data.value(compilerCommandKeyC).toString()); m_compilerCommand = FilePath::fromString(data.value(compilerCommandKeyC).toString());
m_extraCodeModelFlags = data.value(compilerPlatformCodeGenFlagsKeyC).toStringList();
m_targetAbi = Abi::fromString(data.value(targetAbiKeyC).toString()); m_targetAbi = Abi::fromString(data.value(targetAbiKeyC).toString());
return true; return true;
} }