forked from qt-creator/qt-creator
ProjectExplorer: Replace the fromMap error return value
... 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:
@@ -880,7 +880,7 @@ void AndroidBuildApkStep::updateBuildToolsVersionInJsonFile()
|
||||
}
|
||||
}
|
||||
|
||||
bool AndroidBuildApkStep::fromMap(const QVariantMap &map)
|
||||
void AndroidBuildApkStep::fromMap(const QVariantMap &map)
|
||||
{
|
||||
m_keystorePath = FilePath::fromSettings(map.value(KeystoreLocationKey));
|
||||
m_signPackage = false; // don't restore this
|
||||
@@ -891,7 +891,7 @@ bool AndroidBuildApkStep::fromMap(const QVariantMap &map)
|
||||
sdkManager()->latestAndroidSdkPlatform());
|
||||
}
|
||||
m_verbose = map.value(VerboseOutputKey).toBool();
|
||||
return ProjectExplorer::BuildStep::fromMap(map);
|
||||
ProjectExplorer::BuildStep::fromMap(map);
|
||||
}
|
||||
|
||||
void AndroidBuildApkStep::toMap(QVariantMap &map) const
|
||||
|
||||
Reference in New Issue
Block a user