summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-12-02 15:15:04 +0100
committerTobias Hunger <tobias.hunger@qt.io>2016-12-02 15:33:32 +0000
commitcae9f70d75caa279eef2a5d3d2561e9ef975b422 (patch)
treeda1d3d7824499fa757fb73e715169328a5b92930
parent983936f9750ee35297ce75492f144812284feb2d (diff)
downloadqt-creator-cae9f70d75caa279eef2a5d3d2561e9ef975b422.tar.gz
CMake: Do not forget cmake generator information on load
Task-number: QTCREATORBUG-17311 Change-Id: I3439933e396f74a092c9b46aaced0a73c33c4407 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakekitinformation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 7375c7feb2..418974c3d7 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -410,8 +410,8 @@ void CMakeGeneratorKitInformation::fix(Kit *k)
void CMakeGeneratorKitInformation::upgrade(Kit *k)
{
const QVariant value = k->value(GENERATOR_ID);
- GeneratorInfo info;
if (value.type() != QVariant::Map) {
+ GeneratorInfo info;
const QString fullName = value.toString();
const int pos = fullName.indexOf(" - ");
if (pos >= 0) {
@@ -420,8 +420,8 @@ void CMakeGeneratorKitInformation::upgrade(Kit *k)
} else {
info.generator = fullName;
}
+ setGeneratorInfo(k, info);
}
- setGeneratorInfo(k, info);
}
KitInformation::ItemList CMakeGeneratorKitInformation::toUserOutput(const Kit *k) const