From 71e9e3832af3b4201c440c704159c3d42e5ff12d Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 1 Aug 2019 17:06:57 +0200 Subject: [PATCH] WebAssembly: Remove ToolChain::fromMap hack GccToolChain::fromMap does not filter anymore. Change-Id: I0e76703ef1074b4d50999a72b1f598856627de74 Reviewed-by: Alessandro Portale --- src/plugins/webassembly/webassemblytoolchain.cpp | 12 ------------ src/plugins/webassembly/webassemblytoolchain.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/src/plugins/webassembly/webassemblytoolchain.cpp b/src/plugins/webassembly/webassemblytoolchain.cpp index 8f5fd8f16ca..ec4726aa6f7 100644 --- a/src/plugins/webassembly/webassemblytoolchain.cpp +++ b/src/plugins/webassembly/webassemblytoolchain.cpp @@ -128,18 +128,6 @@ WebAssemblyToolChain::WebAssemblyToolChain() : setTypeDisplayName(typeAndDisplayName); } -bool WebAssemblyToolChain::fromMap(const QVariantMap &data) -{ - if (!ClangToolChain::fromMap(data)) - return false; - - // TODO: HACK: GccToolChain::fromMap() filters out abis with UnknownOS. Re-add it, here. - if (supportedAbis().isEmpty()) - setSupportedAbis({toolChainAbi()}); - - return true; -} - WebAssemblyToolChainFactory::WebAssemblyToolChainFactory() { setDisplayName(tr("WebAssembly")); diff --git a/src/plugins/webassembly/webassemblytoolchain.h b/src/plugins/webassembly/webassemblytoolchain.h index ab0e703fe60..4693bc7a100 100644 --- a/src/plugins/webassembly/webassemblytoolchain.h +++ b/src/plugins/webassembly/webassemblytoolchain.h @@ -35,9 +35,6 @@ class WebAssemblyToolChain final : public ProjectExplorer::ClangToolChain public: void addToEnvironment(Utils::Environment &env) const override; -protected: - bool fromMap(const QVariantMap &data) override; - private: WebAssemblyToolChain();