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

ProjectExplorer: Make custom toolchains C/C++ only

Browse Source 
That's what they were intended for. There appears to be no use case for
them to represent e.g. a nim compiler.

Change-Id: I8070fb837fe411c3e2b6e5a335e642497437896d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-07-30 12:57:29 +02:00
parent 5baead5eda
commit e75b9f32a9
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/customtoolchain.cpp
View File

@@ -564,7 +564,7 @@ public:
{ {
setDisplayName(Tr::tr("Custom")); setDisplayName(Tr::tr("Custom"));
setSupportedToolchainType(Constants::CUSTOM_TOOLCHAIN_TYPEID); setSupportedToolchainType(Constants::CUSTOM_TOOLCHAIN_TYPEID);
setSupportsAllLanguages(true); setSupportedLanguages({Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID});
setToolchainConstructor([] { return new CustomToolchain; }); setToolchainConstructor([] { return new CustomToolchain; });
setUserCreatable(true); setUserCreatable(true);
} }

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

@@ -659,7 +659,7 @@ Toolchain *ToolchainFactory::createToolchain(Id toolchainType)
QList<Id> ToolchainFactory::supportedLanguages() const QList<Id> ToolchainFactory::supportedLanguages() const
{ {
return m_supportsAllLanguages ? ToolchainManager::allLanguages() : m_supportedLanguages; return m_supportedLanguages;
} }
Id ToolchainFactory::supportedToolchainType() const Id ToolchainFactory::supportedToolchainType() const
@@ -683,11 +683,6 @@ void ToolchainFactory::setSupportedLanguages(const QList<Id> &supportedLanguages
m_supportedLanguages = supportedLanguages; m_supportedLanguages = supportedLanguages;
} }
void ToolchainFactory::setSupportsAllLanguages(bool supportsAllLanguages)
{
m_supportsAllLanguages = supportsAllLanguages;
}
void ToolchainFactory::setToolchainConstructor(const ToolchainConstructor &toolchainContructor) void ToolchainFactory::setToolchainConstructor(const ToolchainConstructor &toolchainContructor)
{ {
m_toolchainConstructor = toolchainContructor; m_toolchainConstructor = toolchainContructor;

2
src/plugins/projectexplorer/toolchain.h
View File

@@ -296,7 +296,6 @@ protected:
void setDisplayName(const QString &name) { m_displayName = name; } void setDisplayName(const QString &name) { m_displayName = name; }
void setSupportedToolchainType(const Utils::Id &supportedToolchainType); void setSupportedToolchainType(const Utils::Id &supportedToolchainType);
void setSupportedLanguages(const QList<Utils::Id> &supportedLanguages); void setSupportedLanguages(const QList<Utils::Id> &supportedLanguages);
void setSupportsAllLanguages(bool supportsAllLanguages);
using ToolchainConstructor = std::function<Toolchain *()>; using ToolchainConstructor = std::function<Toolchain *()>;
void setToolchainConstructor(const ToolchainConstructor &constructor); void setToolchainConstructor(const ToolchainConstructor &constructor);
ToolchainConstructor toolchainConstructor() const; ToolchainConstructor toolchainConstructor() const;
@@ -318,7 +317,6 @@ private:
QString m_displayName; QString m_displayName;
Utils::Id m_supportedToolchainType; Utils::Id m_supportedToolchainType;
QList<Utils::Id> m_supportedLanguages; QList<Utils::Id> m_supportedLanguages;
bool m_supportsAllLanguages = false;
bool m_userCreatable = false; bool m_userCreatable = false;
ToolchainConstructor m_toolchainConstructor; ToolchainConstructor m_toolchainConstructor;
}; };