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

PythonEditor: Fix run configuration

Browse Source 
This amends commit 53a151074a.

Change-Id: Icf171667b6d03802e0be615c8c7b9491b8d6fd54
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2018-01-08 18:58:34 +01:00
parent e75dd28d0c
commit 7d039de7a8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/pythoneditor/pythoneditorplugin.cpp
View File

@@ -189,9 +189,16 @@ QVariantMap PythonRunConfiguration::toMap() const
bool PythonRunConfiguration::fromMap(const QVariantMap &map) bool PythonRunConfiguration::fromMap(const QVariantMap &map)
{ {
if (!RunConfiguration::fromMap(map))
return false;
m_mainScript = map.value(MainScriptKey).toString(); m_mainScript = map.value(MainScriptKey).toString();
m_interpreter = map.value(InterpreterKey).toString(); m_interpreter = map.value(InterpreterKey).toString();
return RunConfiguration::fromMap(map); // FIXME: The following three lines can be removed once there is no id mangling anymore.
if (m_mainScript.isEmpty()) {
m_mainScript = ProjectExplorer::idFromMap(map).suffixAfter(id());
setDefaultDisplayName(defaultDisplayName());
}
return true;
} }
QString PythonRunConfiguration::defaultDisplayName() const QString PythonRunConfiguration::defaultDisplayName() const
@@ -270,7 +277,6 @@ public:
return Utils::transform(parent->project()->files(Project::AllFiles), [](const FileName &fn) { return Utils::transform(parent->project()->files(Project::AllFiles), [](const FileName &fn) {
BuildTargetInfo bti; BuildTargetInfo bti;
bti.targetName = fn.toString(); bti.targetName = fn.toString();
bti.displayName = fn.toString();
return bti; return bti;
}); });
} }