diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 1a2f024be5e..c666365ab31 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -296,11 +296,6 @@ IarToolChain::IarToolChain() : setCompilerCommandKey("CompilerPath"); } -bool IarToolChain::isValid() const -{ - return true; -} - ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() const { Environment env = Environment::systemEnvironment(); diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h index 00fb4fa1994..fb42da3c73b 100644 --- a/src/plugins/baremetal/iarewtoolchain.h +++ b/src/plugins/baremetal/iarewtoolchain.h @@ -53,8 +53,6 @@ class IarToolChain final : public ProjectExplorer::ToolChain Q_DECLARE_TR_FUNCTIONS(IarToolChain) public: - bool isValid() const final; - MacroInspectionRunner createMacroInspectionRunner() const final; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final; diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index e09f7a01782..b2e58dc6ca2 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -435,11 +435,6 @@ KeilToolChain::KeilToolChain() : setCompilerCommandKey("CompilerPath"); } -bool KeilToolChain::isValid() const -{ - return true; -} - ToolChain::MacroInspectionRunner KeilToolChain::createMacroInspectionRunner() const { Environment env = Environment::systemEnvironment(); diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h index 6ca203bb8f9..3dd620266d0 100644 --- a/src/plugins/baremetal/keiltoolchain.h +++ b/src/plugins/baremetal/keiltoolchain.h @@ -53,8 +53,6 @@ class KeilToolChain final : public ProjectExplorer::ToolChain Q_DECLARE_TR_FUNCTIONS(KeilToolChain) public: - bool isValid() const final; - MacroInspectionRunner createMacroInspectionRunner() const final; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final; diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index a3527b77646..5e2d22b3b0c 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -219,11 +219,6 @@ SdccToolChain::SdccToolChain() : setCompilerCommandKey("CompilerPath"); } -bool SdccToolChain::isValid() const -{ - return true; -} - ToolChain::MacroInspectionRunner SdccToolChain::createMacroInspectionRunner() const { Environment env = Environment::systemEnvironment(); diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h index fb0f6473f02..da9039c8272 100644 --- a/src/plugins/baremetal/sdcctoolchain.h +++ b/src/plugins/baremetal/sdcctoolchain.h @@ -52,8 +52,6 @@ class SdccToolChain final : public ProjectExplorer::ToolChain Q_DECLARE_TR_FUNCTIONS(SdccToolChain) public: - bool isValid() const final; - MacroInspectionRunner createMacroInspectionRunner() const final; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final; diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp index 91d2d4a9136..7a8c8d01895 100644 --- a/src/plugins/nim/project/nimtoolchain.cpp +++ b/src/plugins/nim/project/nimtoolchain.cpp @@ -53,14 +53,6 @@ NimToolChain::NimToolChain(Utils::Id typeId) setCompilerCommandKey("Nim.NimToolChain.CompilerCommand"); } -bool NimToolChain::isValid() const -{ - if (compilerCommand().isEmpty()) - return false; - QFileInfo fi = compilerCommand().toFileInfo(); - return fi.isExecutable(); -} - ToolChain::MacroInspectionRunner NimToolChain::createMacroInspectionRunner() const { return ToolChain::MacroInspectionRunner(); diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h index 6bd9a35f101..f33aa35eec4 100644 --- a/src/plugins/nim/project/nimtoolchain.h +++ b/src/plugins/nim/project/nimtoolchain.h @@ -38,8 +38,6 @@ public: NimToolChain(); explicit NimToolChain(Utils::Id typeId); - bool isValid() const override; - MacroInspectionRunner createMacroInspectionRunner() const override; Utils::LanguageExtensions languageExtensions(const QStringList &flags) const final; Utils::WarningFlags warningFlags(const QStringList &flags) const final; diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index da8a0dfb513..8dfc340cb6b 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -344,15 +344,6 @@ Abis GccToolChain::supportedAbis() const return m_supportedAbis; } -bool GccToolChain::isValid() const -{ - if (compilerCommand().isEmpty()) - return false; - - QFileInfo fi = compilerCommand().toFileInfo(); - return fi.isExecutable(); -} - static bool isNetworkCompiler(const QString &dirPath) { return dirPath.contains("icecc") || dirPath.contains("distcc"); diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index 4ae34fb402e..458b220a0b9 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -75,7 +75,6 @@ public: Utils::FilePath installDir() const override; QString version() const; Abis supportedAbis() const override; - bool isValid() const override; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const override; Utils::WarningFlags warningFlags(const QStringList &cflags) const override; diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 6ba99e8b36a..237761a7eeb 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -159,6 +159,14 @@ Abis ToolChain::supportedAbis() const return {targetAbi()}; } +bool ToolChain::isValid() const +{ + if (compilerCommand().isEmpty()) + return false; + QFileInfo fi = compilerCommand().toFileInfo(); + return fi.isExecutable(); +} + QStringList ToolChain::includedFiles(const QStringList &flags, const QString &directory) const { Q_UNUSED(flags) diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 674c96aef3b..a2d5494f87b 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -103,7 +103,7 @@ public: virtual QStringList extraCodeModelFlags() const { return QStringList(); } virtual Utils::FilePath installDir() const { return Utils::FilePath(); } - virtual bool isValid() const = 0; + virtual bool isValid() const; virtual Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const = 0; virtual Utils::WarningFlags warningFlags(const QStringList &cflags) const = 0;