From c79a4fab6e6ce66fa7ca3fe128668a7393ea39dd Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 12 May 2021 17:25:24 +0200
Subject: Revert "ProjectExplorer: Remove ClangClToolChain::m_clangPath"

This reverts commit 7a2e49435cc098dfc2a037d42d90a8743b7b51d9
as it broke handling clang-cl toolchains on Windows.

Fixes: QTCREATORBUG-25690
Fixes: QTCREATORBUG-25693
Fixes: QTCREATORBUG-25698
Change-Id: Idfc7bc86ad8dd97f645908d4fe9530c760085347
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/msvctoolchain.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/plugins/projectexplorer/msvctoolchain.h')

diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index f81566a0fc..339ebb50ae 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -164,18 +164,28 @@ public:
     bool isValid() const override;
     QStringList suggestedMkspecList() const override;
     void addToEnvironment(Utils::Environment &env) const override;
+    Utils::FilePath compilerCommand() const override; // FIXME: Remove
     QList<Utils::OutputLineParser *> createOutputParsers() const override;
+    QVariantMap toMap() const override;
+    bool fromMap(const QVariantMap &data) override;
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &env) const override;
 
     const QList<MsvcToolChain *> &msvcToolchains() const;
+    QString clangPath() const { return m_clangPath; }
+    void setClangPath(const QString &path) { m_clangPath = path; }
 
     Macros msvcPredefinedMacros(const QStringList &cxxflags,
                                 const Utils::Environment &env) const override;
     Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags,
                                                const Utils::Id &language,
                                                const Macros &macros) const override;
+
+    bool operator==(const ToolChain &) const override;
+
+private:
+    QString m_clangPath;
 };
 
 // --------------------------------------------------------------------------
-- 
cgit v1.2.3