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

Utils: Temporarily introdce Key Id::toKey()

Browse Source 
To avoid complications on the user code side during the Key/Store
transition.

Change-Id: I49ae9d496c9c1ee07f17245616fdefefe9abfc2e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-08-28 18:19:24 +02:00
parent d304e82e63
commit aa7c817f7a
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -87,24 +87,19 @@ void IosDsymBuildStep::toMap(Store &map) const
{
AbstractProcessStep::toMap(map);
// FIXME: Clean up after QVariantMap -> Utils::Store transition
// This is map.insert(id().name() + ARGUMENTS_PARTIAL_KEY), arguments())
map.insert(keyFromString(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString()),
arguments());
map.insert(keyFromString(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString()),
isDefault());
map.insert(keyFromString(id().withSuffix(CLEAN_PARTIAL_KEY).toString()), m_clean);
map.insert(keyFromString(id().withSuffix(COMMAND_PARTIAL_KEY).toString()), command().toSettings());
map.insert(id().toKey() + ARGUMENTS_PARTIAL_KEY, arguments());
map.insert(id().toKey() + USE_DEFAULT_ARGS_PARTIAL_KEY, isDefault());
map.insert(id().toKey() + CLEAN_PARTIAL_KEY, m_clean);
map.insert(id().toKey() + COMMAND_PARTIAL_KEY, command().toSettings());
}
void IosDsymBuildStep::fromMap(const Store &map)
{
QVariant bArgs = map.value(keyFromString(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString()));
QVariant bArgs = map.value(id().toKey() + ARGUMENTS_PARTIAL_KEY);
m_arguments = bArgs.toStringList();
bool useDefaultArguments = map.value(
keyFromString(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString())).toBool();
m_clean = map.value(keyFromString(id().withSuffix(CLEAN_PARTIAL_KEY).toString()), m_clean).toBool();
m_command = FilePath::fromSettings(map.value(keyFromString(id().withSuffix(COMMAND_PARTIAL_KEY).toString())));
bool useDefaultArguments = map.value(id().toKey() + USE_DEFAULT_ARGS_PARTIAL_KEY).toBool();
m_clean = map.value(id().toKey() + CLEAN_PARTIAL_KEY, m_clean).toBool();
m_command = FilePath::fromSettings(map.value(id().toKey() + COMMAND_PARTIAL_KEY));
if (useDefaultArguments) {
m_command = defaultCommand();
m_arguments = defaultArguments();