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

Conan: Do detect conan.exe on Windows

Browse Source 
Change-Id: I85e03a4f41896e9d20d8d757cb414217adcd536b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Kai Köhne
2021-01-28 16:38:12 +01:00
committed by Kai Koehne
parent 87ec0f349f
commit f0cb3e3365
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/conan/conansettings.cpp
View File

@@ -24,6 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "conansettings.h" #include "conansettings.h"
#include <utils/hostosinfo.h>
namespace ConanPackageManager { namespace ConanPackageManager {
namespace Internal { namespace Internal {
@@ -37,8 +38,9 @@ void ConanSettings::fromSettings(QSettings *settings)
{ {
const QString rootKey = QString(SETTINGS_KEY) + '/'; const QString rootKey = QString(SETTINGS_KEY) + '/';
const QString defaultExe = Utils::HostOsInfo::withExecutableSuffix(QString("conan"));
m_conanFilePath = Utils::FilePath::fromUserInput( 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 void ConanSettings::toSettings(QSettings *settings) const