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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
This commit is contained in:
Eike Ziller
2019-05-08 12:41:25 +02:00
parent d0839bc1de 75e408584a
commit 4545c81e57
108 changed files with 1536 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -623,19 +623,12 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
// remove data:
QVariantMap cleaned = RmKeysOperation::rmKeys(map, {COUNT, DEFAULT});
// Sanity check: Make sure displayName is unique.
QStringList nameKeys = FindKeyOperation::findKey(map, DISPLAYNAME);
QStringList nameList;
foreach (const QString &nameKey, nameKeys)
nameList << GetOperation::get(map, nameKey).toString();
const QString uniqueName = makeUnique(displayName, nameList);
// insert data:
KeyValuePairList data = { KeyValuePair({kit, ID}, QVariant(id)),
KeyValuePair({kit, DISPLAYNAME}, QVariant(uniqueName)),
KeyValuePair({kit, ICON}, QVariant(icon)),
KeyValuePair({kit, AUTODETECTED}, QVariant(true)),
KeyValuePair({kit, SDK}, QVariant(true))};
KeyValuePairList data = {KeyValuePair({kit, ID}, QVariant(id)),
KeyValuePair({kit, DISPLAYNAME}, QVariant(displayName)),
KeyValuePair({kit, ICON}, QVariant(icon)),
KeyValuePair({kit, AUTODETECTED}, QVariant(true)),
KeyValuePair({kit, SDK}, QVariant(true))};
if (!debuggerId.isEmpty() || !debugger.isEmpty()) {
if (debuggerId.isEmpty()) {