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

ProjectExplorer: Replace the fromMap error return value

Browse Source 
... by some out-of-band mechanism, keeping previous functionality.

The driving reason is to get the same fromMap signature as in the
AspectContainer base, however, the whole mechanism seems rather useless:
There are only a few places that actually ever could report errors,
in those places "moving on" looks ok, too, and these few places
are not conceptually different than a lot others.

Removal of this (new) mechanism is left for later.

Change-Id: Ibe7a0456bc3b84a84e942231f14446e783372d76
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-21 18:23:50 +02:00
parent a263d3de89
commit 1c4f973365
39 changed files with 100 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -376,7 +376,7 @@ public:
private:
QList<NamedWidget *> createSubConfigWidgets() override;
bool fromMap(const QVariantMap &map) override;
void fromMap(const QVariantMap &map) override;
void updateQmakeCommand();
@@ -414,12 +414,11 @@ QList<NamedWidget *> IosQmakeBuildConfiguration::createSubConfigWidgets()
return subConfigWidgets;
}
bool IosQmakeBuildConfiguration::fromMap(const QVariantMap &map)
void IosQmakeBuildConfiguration::fromMap(const QVariantMap &map)
{
if (!QmakeBuildConfiguration::fromMap(map))
return false;
updateQmakeCommand();
return true;
QmakeBuildConfiguration::fromMap(map);
if (!hasError())
updateQmakeCommand();
}
static QString teamIdForProvisioningProfile(const QString &id)
@@ -489,7 +488,6 @@ public:
private:
QList<NamedWidget *> createSubConfigWidgets() override;
bool fromMap(const QVariantMap &map) override;
CMakeProjectManager::CMakeConfig signingFlags() const final;
@@ -527,13 +525,6 @@ QList<NamedWidget *> IosCMakeBuildConfiguration::createSubConfigWidgets()
return subConfigWidgets;
}
bool IosCMakeBuildConfiguration::fromMap(const QVariantMap &map)
{
if (!CMakeBuildConfiguration::fromMap(map))
return false;
return true;
}
CMakeConfig IosCMakeBuildConfiguration::signingFlags() const
{
if (DeviceTypeKitAspect::deviceTypeId(kit()) != Constants::IOS_DEVICE_TYPE)