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

McuSupport: remove cmake mapper

Browse Source 
Starting with Qt For MCUs 2.0, environment variables are not
used to track dependencies any more, but cmake variables are.
Due to time constraints, we implemented a env-to-cmake mapper
to cover that gap at the moment. This patch removes that hack
and implements tracking dependencies through cmake variables.

Task-number: QTCREATORBUG-26904
Change-Id: Id8553a764d212d9b12e4adc54fc56233bfeb9a5b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christiaan Janssen
2022-02-22 13:36:55 +01:00
committed by Piotr Mućko
parent cd8c4ced81
commit e293aab725
17 changed files with 487 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/mcusupport/mcupackage.cpp
View File

@@ -53,6 +53,7 @@ McuPackage::McuPackage(const QString &label,
const FilePath &defaultPath,
const FilePath &detectionPath,
const QString &settingsKey,
const QString &cmakeVarName,
const QString &envVarName,
const QString &downloadUrl,
const McuPackageVersionDetector *versionDetector,
@@ -64,6 +65,7 @@ McuPackage::McuPackage(const QString &label,
, m_settingsKey(settingsKey)
, m_versionDetector(versionDetector)
, m_relativePathModifier(relativePathModifier)
, m_cmakeVariableName(cmakeVarName)
, m_environmentVariableName(envVarName)
, m_downloadUrl(downloadUrl)
, m_addToSystemPath(addToSystemPath)
@@ -81,6 +83,11 @@ QString McuPackage::settingsKey() const
return m_settingsKey;
}
const QString &McuPackage::cmakeVariableName() const
{
return m_cmakeVariableName;
}
const QString &McuPackage::environmentVariableName() const
{
return m_environmentVariableName;
@@ -278,9 +285,10 @@ McuToolChainPackage::McuToolChainPackage(const QString &label,
const FilePath &detectionPath,
const QString &settingsKey,
McuToolChainPackage::ToolChainType type,
const QString &cmakeVarName,
const QString &envVarName,
const McuPackageVersionDetector *versionDetector)
: McuPackage(label, defaultPath, detectionPath, settingsKey, envVarName, {}, versionDetector)
: McuPackage(label, defaultPath, detectionPath, settingsKey, cmakeVarName, envVarName, {}, versionDetector)
, m_type(type)
{}