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

ProjectExplorer: Remove ToolChain updating code from 4.3

Browse Source 
The current format is apparently stable since May 2017.

Change-Id: I8be705c87578f0e93dbb9494206ccf3e5d8b9e64
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-08-28 17:32:11 +02:00
parent bd89cc1fd5
commit 735e9fc58e
1 changed files with 3 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/plugins/projectexplorer/kitaspects.cpp
View File

@@ -37,10 +37,6 @@ using namespace Utils;
namespace ProjectExplorer {
const char KITINFORMATION_ID_V1[] = "PE.Profile.ToolChain";
const char KITINFORMATION_ID_V2[] = "PE.Profile.ToolChains";
const char KITINFORMATION_ID_V3[] = "PE.Profile.ToolChainsV3";
// --------------------------------------------------------------------------
// SysRootKitAspect:
// --------------------------------------------------------------------------
@@ -331,7 +327,6 @@ public:
private:
Tasks validate(const Kit *k) const override;
void upgrade(Kit *k) override;
void fix(Kit *k) override;
void setup(Kit *k) override;
@@ -410,70 +405,6 @@ Tasks ToolChainKitAspectFactory::validate(const Kit *k) const
return result;
}
void ToolChainKitAspectFactory::upgrade(Kit *k)
{
QTC_ASSERT(k, return);
const Id oldIdV1 = KITINFORMATION_ID_V1;
const Id oldIdV2 = KITINFORMATION_ID_V2;
// upgrade <=4.1 to 4.2 (keep old settings around for now)
{
const QVariant oldValue = k->value(oldIdV1);
const QVariant value = k->value(oldIdV2);
if (value.isNull() && !oldValue.isNull()) {
QVariantMap newValue;
if (oldValue.typeId() == QVariant::Map) {
// Used between 4.1 and 4.2:
newValue = oldValue.toMap();
} else {
// Used up to 4.1:
newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx), oldValue.toString());
const Id typeId = DeviceTypeKitAspect::deviceTypeId(k);
if (typeId == Constants::DESKTOP_DEVICE_TYPE) {
// insert default C compiler which did not exist before
newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C),
defaultToolChainIds().value(Id(Constants::C_LANGUAGE_ID)));
}
}
k->setValue(oldIdV2, newValue);
k->setSticky(oldIdV2, k->isSticky(oldIdV1));
}
}
// upgrade 4.2 to 4.3 (keep old settings around for now)
{
const QVariant oldValue = k->value(oldIdV2);
const QVariant value = k->value(ToolChainKitAspect::id());
if (value.isNull() && !oldValue.isNull()) {
QVariantMap newValue = oldValue.toMap();
QVariantMap::iterator it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C));
if (it != newValue.end())
newValue.insert(Id(Constants::C_LANGUAGE_ID).toString(), it.value());
it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx));
if (it != newValue.end())
newValue.insert(Id(Constants::CXX_LANGUAGE_ID).toString(), it.value());
k->setValue(ToolChainKitAspect::id(), newValue);
k->setSticky(ToolChainKitAspect::id(), k->isSticky(oldIdV2));
}
}
// upgrade 4.3-temporary-master-state to 4.3:
{
const QVariantMap valueMap = k->value(ToolChainKitAspect::id()).toMap();
QVariantMap result;
for (const QString &key : valueMap.keys()) {
const int pos = key.lastIndexOf('.');
if (pos >= 0)
result.insert(key.mid(pos + 1), valueMap.value(key));
else
result.insert(key, valueMap.value(key));
}
k->setValue(ToolChainKitAspect::id(), result);
}
}
void ToolChainKitAspectFactory::fix(Kit *k)
{
QTC_ASSERT(ToolChainManager::isLoaded(), return);
@@ -613,7 +544,9 @@ QSet<Id> ToolChainKitAspectFactory::availableFeatures(const Kit *k) const
Id ToolChainKitAspect::id()
{
return KITINFORMATION_ID_V3;
// "PE.Profile.ToolChain" until 4.2
// "PE.Profile.ToolChains" temporarily before 4.3 (May 2017)
return "PE.Profile.ToolChainsV3";
}
QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Id language)