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

Sdktool: Fix default kit handling

Browse Source 
The default kit is addressed by its id, not its number for a long
time now. Update sdktool accordingly.

Change-Id: Iad0d0c6eda2aa824fa8add99871db7efebb30e75
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-04-30 12:54:48 +02:00
parent 3bbc83addc
commit 5aba7fb095
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/sdktool/addkitoperation.cpp
View File

@@ -289,7 +289,7 @@ bool AddKitOperation::test() const
|| !map.contains(QLatin1String(COUNT))
|| map.value(QLatin1String(COUNT)).toInt() != 0
|| !map.contains(QLatin1String(DEFAULT))
|| map.value(QLatin1String(DEFAULT)).toInt() != -1)
|| !map.value(QLatin1String(DEFAULT)).toString().isEmpty())
return false;
// Fail if TC is not there:
@@ -352,7 +352,7 @@ bool AddKitOperation::test() const
|| !map.contains(QLatin1String(COUNT))
|| map.value(QLatin1String(COUNT)).toInt() != 1
|| !map.contains(QLatin1String(DEFAULT))
|| map.value(QLatin1String(DEFAULT)).toInt() != 0
|| map.value(QLatin1String(DEFAULT)).toString() != QLatin1String("testId")
|| !map.contains(QLatin1String("Profile.0")))
return false;
@@ -571,14 +571,9 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
}
const QString kit = QString::fromLatin1(PREFIX) + QString::number(count);
int defaultKit = GetOperation::get(map, QLatin1String(DEFAULT)).toInt(&ok);
if (!ok) {
std::cerr << "Error: Default kit seems wrong." << std::endl;
return QVariantMap();
}
if (defaultKit < 0)
defaultKit = 0;
QString defaultKit = GetOperation::get(map, QLatin1String(DEFAULT)).toString();
if (defaultKit.isEmpty())
defaultKit = id;
// remove data:
QStringList toRemove;
@@ -645,7 +640,7 @@ QVariantMap AddKitOperation::initializeKits()
{
QVariantMap map;
map.insert(QLatin1String(VERSION), 1);
map.insert(QLatin1String(DEFAULT), -1);
map.insert(QLatin1String(DEFAULT), QString());
map.insert(QLatin1String(COUNT), 0);
return map;
}

2
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -251,7 +251,7 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map,
const QString tc = QString::fromLatin1(PREFIX) + QString::number(count);
KeyValuePairList data;
data << KeyValuePair(QStringList() << tc << QLatin1String(ID), QVariant(id.toUtf8()));
data << KeyValuePair(QStringList() << tc << QLatin1String(ID), QVariant(id));
data << KeyValuePair(QStringList() << tc << QLatin1String(DISPLAYNAME), QVariant(uniqueName));
data << KeyValuePair(QStringList() << tc << QLatin1String(AUTODETECTED), QVariant(true));
data << KeyValuePair(QStringList() << tc << QLatin1String(PATH), QVariant(path));