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

BareMetal: Use aspect for IarToolChain::m_extraCodeModelFlags

Browse Source 
Change-Id: I6438c93bb2a5200cf628900184a7db59d1fa1689
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-20 17:49:32 +02:00
parent da856ea9f1
commit 6b8a70b37e
1 changed files with 12 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -36,8 +36,6 @@ namespace BareMetal::Internal {
// Helpers: // Helpers:
static const char compilerPlatformCodeGenFlagsKeyC[] = "PlatformCodeGenFlags";
static bool compilerExists(const FilePath &compilerPath) static bool compilerExists(const FilePath &compilerPath)
{ {
const QFileInfo fi = compilerPath.toFileInfo(); const QFileInfo fi = compilerPath.toFileInfo();
@@ -298,6 +296,10 @@ public:
setTypeDisplayName(Tr::tr("IAREW")); setTypeDisplayName(Tr::tr("IAREW"));
setTargetAbiKey("TargetAbi"); setTargetAbiKey("TargetAbi");
setCompilerCommandKey("CompilerPath"); setCompilerCommandKey("CompilerPath");
m_extraCodeModelFlags.setSettingsKey("PlatformCodeGenFlags");
connect(&m_extraCodeModelFlags, &BaseAspect::changed,
this, &IarToolChain::toolChainUpdated);
} }
MacroInspectionRunner createMacroInspectionRunner() const final; MacroInspectionRunner createMacroInspectionRunner() const final;
@@ -309,20 +311,16 @@ public:
void addToEnvironment(Environment &env) const final; void addToEnvironment(Environment &env) const final;
QList<OutputLineParser *> createOutputParsers() const final; QList<OutputLineParser *> createOutputParsers() const final;
void toMap(QVariantMap &data) const final;
bool fromMap(const QVariantMap &data) final;
std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() final; std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() final;
bool operator==(const ToolChain &other) const final; bool operator==(const ToolChain &other) const final;
void setExtraCodeModelFlags(const QStringList &flags); QStringList extraCodeModelFlags() const final { return m_extraCodeModelFlags(); }
QStringList extraCodeModelFlags() const final;
FilePath makeCommand(const Environment &env) const final; FilePath makeCommand(const Environment &) const final { return {}; }
private: private:
QStringList m_extraCodeModelFlags; StringListAspect m_extraCodeModelFlags{this};
friend class IarToolChainFactory; friend class IarToolChainFactory;
friend class IarToolChainConfigWidget; friend class IarToolChainConfigWidget;
@@ -335,7 +333,7 @@ ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() con
const FilePath compiler = compilerCommand(); const FilePath compiler = compilerCommand();
const Id languageId = language(); const Id languageId = language();
const QStringList extraArgs = m_extraCodeModelFlags; const QStringList extraArgs = m_extraCodeModelFlags();
MacrosCache macrosCache = predefinedMacrosCache(); MacrosCache macrosCache = predefinedMacrosCache();
return [env, compiler, extraArgs, macrosCache, languageId] return [env, compiler, extraArgs, macrosCache, languageId]
@@ -404,20 +402,6 @@ QList<Utils::OutputLineParser *> IarToolChain::createOutputParsers() const
return {new IarParser()}; return {new IarParser()};
} }
void IarToolChain::toMap(QVariantMap &data) const
{
ToolChain::toMap(data);
data.insert(compilerPlatformCodeGenFlagsKeyC, m_extraCodeModelFlags);
}
bool IarToolChain::fromMap(const QVariantMap &data)
{
if (!ToolChain::fromMap(data))
return false;
m_extraCodeModelFlags = data.value(compilerPlatformCodeGenFlagsKeyC).toStringList();
return true;
}
std::unique_ptr<ToolChainConfigWidget> IarToolChain::createConfigurationWidget() std::unique_ptr<ToolChainConfigWidget> IarToolChain::createConfigurationWidget()
{ {
return std::make_unique<IarToolChainConfigWidget>(this); return std::make_unique<IarToolChainConfigWidget>(this);
@@ -430,27 +414,10 @@ bool IarToolChain::operator==(const ToolChain &other) const
const auto customTc = static_cast<const IarToolChain *>(&other); const auto customTc = static_cast<const IarToolChain *>(&other);
return compilerCommand() == customTc->compilerCommand() return compilerCommand() == customTc->compilerCommand()
&& m_extraCodeModelFlags == customTc->m_extraCodeModelFlags; && m_extraCodeModelFlags() == customTc->m_extraCodeModelFlags();
} }
void IarToolChain::setExtraCodeModelFlags(const QStringList &flags)
{
if (flags == m_extraCodeModelFlags)
return;
m_extraCodeModelFlags = flags;
toolChainUpdated();
}
QStringList IarToolChain::extraCodeModelFlags() const
{
return m_extraCodeModelFlags;
}
FilePath IarToolChain::makeCommand(const Environment &env) const
{
Q_UNUSED(env)
return {};
}
// IarToolChainFactory // IarToolChainFactory
@@ -629,7 +596,9 @@ void IarToolChainConfigWidget::applyImpl()
const auto tc = static_cast<IarToolChain *>(toolChain()); const auto tc = static_cast<IarToolChain *>(toolChain());
const QString displayName = tc->displayName(); const QString displayName = tc->displayName();
tc->setCompilerCommand(m_compilerCommand->filePath()); tc->setCompilerCommand(m_compilerCommand->filePath());
tc->setExtraCodeModelFlags(splitString(m_platformCodeGenFlagsLineEdit->text()));
tc->m_extraCodeModelFlags.setValue(splitString(m_platformCodeGenFlagsLineEdit->text()));
tc->setTargetAbi(m_abiWidget->currentAbi()); tc->setTargetAbi(m_abiWidget->currentAbi());
tc->setDisplayName(displayName); tc->setDisplayName(displayName);