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

Kit: ignore invalid ids

Browse Source 
Change-Id: I4947b4188fdddaa63670891fb8988324ff6686fd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Nikita Baryshnikov
2015-04-29 19:39:45 +03:00
committed by Tobias Hunger
parent 271794fbc9
commit b3a8444c30
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/kit.cpp
View File

@@ -175,16 +175,21 @@ Kit::Kit(const QVariantMap &data) :
QVariantMap extra = data.value(QLatin1String(DATA_KEY)).toMap(); QVariantMap extra = data.value(QLatin1String(DATA_KEY)).toMap();
d->m_data.clear(); // remove default values d->m_data.clear(); // remove default values
const QVariantMap::ConstIterator cend = extra.constEnd(); const QVariantMap::ConstIterator cend = extra.constEnd();
for (QVariantMap::ConstIterator it = extra.constBegin(); it != cend; ++it) for (QVariantMap::ConstIterator it = extra.constBegin(); it != cend; ++it) {
d->m_data.insert(Id::fromString(it.key()), it.value()); const QString key = it.key();
if (!key.isEmpty())
d->m_data.insert(Id::fromString(key), it.value());
}
QStringList mutableInfoList = data.value(QLatin1String(MUTABLE_INFO_KEY)).toStringList(); QStringList mutableInfoList = data.value(QLatin1String(MUTABLE_INFO_KEY)).toStringList();
foreach (const QString &mutableInfo, mutableInfoList) foreach (const QString &mutableInfo, mutableInfoList)
d->m_mutable.insert(Id::fromString(mutableInfo)); if (!mutableInfo.isEmpty())
d->m_mutable.insert(Id::fromString(mutableInfo));
QStringList stickyInfoList = data.value(QLatin1String(STICKY_INFO_KEY)).toStringList(); QStringList stickyInfoList = data.value(QLatin1String(STICKY_INFO_KEY)).toStringList();
foreach (const QString &stickyInfo, stickyInfoList) foreach (const QString &stickyInfo, stickyInfoList)
d->m_sticky.insert(Id::fromString(stickyInfo)); if (!stickyInfo.isEmpty())
d->m_sticky.insert(Id::fromString(stickyInfo));
} }
Kit::~Kit() Kit::~Kit()