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

CMake: Do not forget cmake generator information on load

Browse Source 
Task-number: QTCREATORBUG-17311
Change-Id: I3439933e396f74a092c9b46aaced0a73c33c4407
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-02 15:15:04 +01:00
parent 983936f975
commit cae9f70d75
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -410,8 +410,8 @@ void CMakeGeneratorKitInformation::fix(Kit *k)
void CMakeGeneratorKitInformation::upgrade(Kit *k) void CMakeGeneratorKitInformation::upgrade(Kit *k)
{ {
const QVariant value = k->value(GENERATOR_ID); const QVariant value = k->value(GENERATOR_ID);
GeneratorInfo info;
if (value.type() != QVariant::Map) { if (value.type() != QVariant::Map) {
GeneratorInfo info;
const QString fullName = value.toString(); const QString fullName = value.toString();
const int pos = fullName.indexOf(" - "); const int pos = fullName.indexOf(" - ");
if (pos >= 0) { if (pos >= 0) {
@@ -420,9 +420,9 @@ void CMakeGeneratorKitInformation::upgrade(Kit *k)
} else { } else {
info.generator = fullName; info.generator = fullName;
} }
}
setGeneratorInfo(k, info); setGeneratorInfo(k, info);
} }
}
KitInformation::ItemList CMakeGeneratorKitInformation::toUserOutput(const Kit *k) const KitInformation::ItemList CMakeGeneratorKitInformation::toUserOutput(const Kit *k) const
{ {