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

Kits: Keep 4.1 toolchain information around

Browse Source 
This stops creator from breaking settings when switching between the 4.1 and
the master branch.

Change-Id: I58a9b588368e2bd2a235503a5ca204d48ea5cead
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-07-18 14:59:59 +02:00
committed by Eike Ziller
parent 316ad743fa
commit 55d5f1ed01
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -267,7 +267,7 @@ IOutputParser *ToolChainKitInformation::createOutputParser(const Kit *k) const
Core::Id ToolChainKitInformation::id() Core::Id ToolChainKitInformation::id()
{ {
return "PE.Profile.ToolChain"; return "PE.Profile.ToolChains";
} }
ToolChain *ToolChainKitInformation::toolChain(const Kit *k, ToolChain::Language l) ToolChain *ToolChainKitInformation::toolChain(const Kit *k, ToolChain::Language l)
@@ -347,14 +347,21 @@ QString ToolChainKitInformation::msgNoToolChainInTarget()
QVariantMap ToolChainKitInformation::readValue(const Kit *k) QVariantMap ToolChainKitInformation::readValue(const Kit *k)
{ {
QVariant value = k->value(ToolChainKitInformation::id()); const QVariant oldValue = k->value("PE.Profile.ToolChain");
if (value.isNull()) const QVariant value = k->value(ToolChainKitInformation::id());
value = defaultValue(); if (value.isNull()) {
else if (value.type() == QVariant::String) { if (!oldValue.isNull()) {
// Legacy value: Convert... if (oldValue.type() == QVariant::Map) {
QVariantMap tmp; // Used between 4.1 and 4.2:
tmp.insert(ToolChain::languageDisplayName(ToolChain::Language::Cxx), value.toString()); return oldValue.toMap();
value = tmp; } else {
// Used up to 4.1:
QVariantMap tmp;
tmp.insert(ToolChain::languageDisplayName(ToolChain::Language::Cxx), value.toString());
return tmp;
}
}
return defaultValue().toMap();
} }
return value.toMap(); return value.toMap();
} }