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

PE: Fix compile with Qt 5.14

Browse Source 
Amends 05fa3b06e5.

Change-Id: I26eff2c7f096b0beb77a87486bcae8faa2c137ca
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2021-10-12 08:29:01 +02:00
parent b071603175
commit 46a0abef2e
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -246,9 +246,18 @@ QVariant JsonWizardFactory::mergeDataValueMaps(const QVariant &valueMap, const Q
{ {
QVariantMap retVal; QVariantMap retVal;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QVariantMap &map = defaultValueMap.toMap();
for (auto it = map.begin(), end = map.end(); it != end; ++it)
retVal.insert(it.key(), it.value());
const QVariantMap &map2 = valueMap.toMap();
for (auto it = map2.begin(), end = map2.end(); it != end; ++it)
retVal.insert(it.key(), it.value());
#else
retVal.insert(defaultValueMap.toMap()); retVal.insert(defaultValueMap.toMap());
retVal.insert(valueMap.toMap()); retVal.insert(valueMap.toMap());
#endif
return retVal; return retVal;
} }
@@ -318,16 +327,12 @@ JsonWizardFactory::Page JsonWizardFactory::parsePage(const QVariant &value, QStr
QVariant defaultSubData = defaultData.value(QLatin1String(DATA_KEY)); QVariant defaultSubData = defaultData.value(QLatin1String(DATA_KEY));
QVariant subData; QVariant subData;
if (specifiedSubData.isNull()) { if (specifiedSubData.isNull())
subData = defaultSubData; subData = defaultSubData;
} else if (specifiedSubData.type() == QVariant::Map) { else if (specifiedSubData.type() == QVariant::Map)
QVariantMap subDataMap; subData = mergeDataValueMaps(specifiedSubData.toMap(), defaultSubData.toMap());
subDataMap.insert(defaultSubData.toMap()); else if (specifiedSubData.type() == QVariant::List)
subDataMap.insert(specifiedSubData.toMap());
subData = subDataMap;
} else if (specifiedSubData.type() == QVariant::List) {
subData = specifiedSubData; subData = specifiedSubData;
}
if (!factory->validateData(typeId, subData, errorMessage)) if (!factory->validateData(typeId, subData, errorMessage))
return p; return p;