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

Python: use new runconfiguration aspect update mechanism

Browse Source 
Change-Id: I60807350460e75172bf4744beeb1474755ff4187
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-11-25 18:34:51 +01:00
parent 300a022bcd
commit 684d3e40a7
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/python/pythonrunconfiguration.cpp
View File

@@ -279,13 +279,19 @@ PythonRunConfiguration::PythonRunConfiguration(Target *target, Core::Id id)
return cmd; return cmd;
}); });
connect(target, &Target::buildSystemUpdated, setUpdater([this, scriptAspect] {
this, &PythonRunConfiguration::updateTargetInformation); const BuildTargetInfo bti = buildTargetInfo();
const QString script = bti.targetFilePath.toUserOutput();
setDefaultDisplayName(tr("Run %1").arg(script));
scriptAspect->setValue(script);
});
connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
} }
void PythonRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &) void PythonRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
{ {
updateTargetInformation(); update();
} }
void PythonRunConfiguration::updateLanguageServer() void PythonRunConfiguration::updateLanguageServer()
@@ -325,14 +331,6 @@ QString PythonRunConfiguration::interpreter() const
return aspect<InterpreterAspect>()->currentInterpreter().command.toString(); return aspect<InterpreterAspect>()->currentInterpreter().command.toString();
} }
void PythonRunConfiguration::updateTargetInformation()
{
const BuildTargetInfo bti = buildTargetInfo();
const QString script = bti.targetFilePath.toUserOutput();
setDefaultDisplayName(tr("Run %1").arg(script));
aspect<MainScriptAspect>()->setValue(script);
}
PythonRunConfigurationFactory::PythonRunConfigurationFactory() PythonRunConfigurationFactory::PythonRunConfigurationFactory()
{ {
registerRunConfiguration<PythonRunConfiguration>("PythonEditor.RunConfiguration."); registerRunConfiguration<PythonRunConfiguration>("PythonEditor.RunConfiguration.");

2
src/plugins/python/pythonrunconfiguration.h
View File

@@ -51,8 +51,6 @@ private:
bool supportsDebugger() const; bool supportsDebugger() const;
QString mainScript() const; QString mainScript() const;
QString arguments() const; QString arguments() const;
void updateTargetInformation();
}; };
class PythonRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory class PythonRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory