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

ProjectExplorer: Consolidate *ToolChain::compilerCommand() implementations

Browse Source 
All ToolChains had an compiler command member one way or the other, so have
one in the base class and drop all others.

ClangClToolChain is quirky insofar as it diverts the compilerCommand()
to the additional m_clangPath member. This is left for a later patch.

Change-Id: Ic8b5da17a4b7050966d0c37573edb0706fac2ecf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-11-13 09:39:32 +01:00
parent d30d0e05d8
commit c60c642fe5
18 changed files with 92 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -39,6 +39,8 @@
#include <QFileInfo>
#include <QUuid>
using namespace Utils;
static const char ID_KEY[] = "ProjectExplorer.ToolChain.Id";
static const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ToolChain.DisplayName";
static const char AUTODETECT_KEY[] = "ProjectExplorer.ToolChain.Autodetect";
@@ -69,6 +71,8 @@ public:
}
QByteArray m_id;
FilePath m_compilerCommand;
QString m_compilerCommandKey;
Abi m_targetAbi;
QString m_targetAbiKey;
QSet<Utils::Id> m_supportedLanguages;
@@ -210,6 +214,8 @@ QVariantMap ToolChain::toMap() const
result.insert(QLatin1String(LANGUAGE_KEY_V2), language().toSetting());
if (!d->m_targetAbiKey.isEmpty())
result.insert(d->m_targetAbiKey, d->m_targetAbi.toString());
if (!d->m_compilerCommandKey.isEmpty())
result.insert(d->m_compilerCommandKey, d->m_compilerCommand.toString());
return result;
}
@@ -262,6 +268,24 @@ void ToolChain::setTargetAbiKey(const QString &abiKey)
d->m_targetAbiKey = abiKey;
}
FilePath ToolChain::compilerCommand() const
{
return d->m_compilerCommand;
}
void ToolChain::setCompilerCommand(const FilePath &command)
{
if (command == d->m_compilerCommand)
return;
d->m_compilerCommand = command;
toolChainUpdated();
}
void ToolChain::setCompilerCommandKey(const QString &commandKey)
{
d->m_compilerCommandKey = commandKey;
}
void ToolChain::setTypeDisplayName(const QString &typeName)
{
d->m_typeDisplayName = typeName;
@@ -304,6 +328,8 @@ bool ToolChain::fromMap(const QVariantMap &data)
if (!d->m_targetAbiKey.isEmpty())
d->m_targetAbi = Abi::fromString(data.value(d->m_targetAbiKey).toString());
d->m_compilerCommand = FilePath::fromString(data.value(d->m_compilerCommandKey).toString());
return true;
}