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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/shared/qbs

Change-Id: I5050baa31f4a892d00cd6f7e088d1b597921474d
This commit is contained in:
Eike Ziller
2016-12-05 10:55:35 +01:00
parent 1e70a156f9 c390c716d1
commit 8f0ddff1cc
35 changed files with 452 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,8 +411,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) {