forked from qt-creator/qt-creator
QmakeProject: Remove DesktopQmakeRunConfiguration::fromMap
Base functionality is sufficient: The only difference is triggering updateTargetInformation() and that is triggered (later...) in response to Project::parsingFinished() too. The different timing is uncritical as the run configuration is not accessible in the run settings combo box during that time. Also, no other runconfigurations use that extra call. Change-Id: I1c3379ad35baf70d4a45d1a1a2340927eda93785 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -105,16 +105,6 @@ void DesktopQmakeRunConfiguration::updateTargetInformation()
|
|||||||
aspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
|
aspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DesktopQmakeRunConfiguration::fromMap(const QVariantMap &map)
|
|
||||||
{
|
|
||||||
const bool res = RunConfiguration::fromMap(map);
|
|
||||||
if (!res)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
updateTargetInformation();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void DesktopQmakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
|
void DesktopQmakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
|
||||||
{
|
{
|
||||||
updateTargetInformation();
|
updateTargetInformation();
|
||||||
|
@@ -42,8 +42,6 @@ public:
|
|||||||
void addToBaseEnvironment(Utils::Environment &env) const;
|
void addToBaseEnvironment(Utils::Environment &env) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool fromMap(const QVariantMap &map) override;
|
|
||||||
|
|
||||||
void updateTargetInformation();
|
void updateTargetInformation();
|
||||||
void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
|
void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user