From f0cb3e3365f0e83229802d49465b851a3975c9f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20K=C3=B6hne?= <kai.koehne@qt.io>
Date: Thu, 28 Jan 2021 16:38:12 +0100
Subject: [PATCH] Conan: Do detect conan.exe on Windows

Change-Id: I85e03a4f41896e9d20d8d757cb414217adcd536b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/conan/conansettings.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/conan/conansettings.cpp b/src/plugins/conan/conansettings.cpp
index f1c3857e946..7e5285dc411 100644
--- a/src/plugins/conan/conansettings.cpp
+++ b/src/plugins/conan/conansettings.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "conansettings.h"
+#include <utils/hostosinfo.h>
 
 namespace ConanPackageManager {
 namespace Internal {
@@ -37,8 +38,9 @@ void ConanSettings::fromSettings(QSettings *settings)
 {
     const QString rootKey = QString(SETTINGS_KEY) + '/';
 
+    const QString defaultExe = Utils::HostOsInfo::withExecutableSuffix(QString("conan"));
     m_conanFilePath = Utils::FilePath::fromUserInput(
-        settings->value(rootKey + CONAN_FILE_PATH, QString("conan")).toString());
+        settings->value(rootKey + CONAN_FILE_PATH, defaultExe).toString());
 }
 
 void ConanSettings::toSettings(QSettings *settings) const