diff options
| author | hjk <hjk@qt.io> | 2018-09-12 10:09:41 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-09-13 07:32:22 +0000 |
| commit | f66770cde19579d2e6f2dc88ba9bb6abfe0d821f (patch) | |
| tree | 9f17aac8d278b35881bd677e2f860ceca939a05c /src/plugins/pythoneditor/pythoneditorplugin.cpp | |
| parent | be656dd9cc028d1971f5524e14818efd84629c54 (diff) | |
| download | qt-creator-f66770cde19579d2e6f2dc88ba9bb6abfe0d821f.tar.gz | |
ProjectExplorer: Pass macro expander to ArgumentsAspect::arguments
To remove the last user of IRCAspect::runConfiguration.
Change-Id: I1390166730112008a4050877f96bb29f274e7ef1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
| -rw-r--r-- | src/plugins/pythoneditor/pythoneditorplugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index e64eebd98b..0b5b69797a 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -238,7 +238,7 @@ private: bool supportsDebugger() const { return true; } QString mainScript() const { return extraAspect<MainScriptAspect>()->value(); } - QString arguments() const { return extraAspect<ArgumentsAspect>()->arguments(); } + QString arguments() const { return extraAspect<ArgumentsAspect>()->arguments(macroExpander()); } QString interpreter() const { return extraAspect<InterpreterAspect>()->value(); } void updateTargetInformation(); @@ -286,7 +286,8 @@ Runnable PythonRunConfiguration::runnable() const { Runnable r; QtcProcess::addArg(&r.commandLineArguments, mainScript()); - QtcProcess::addArgs(&r.commandLineArguments, extraAspect<ArgumentsAspect>()->arguments()); + QtcProcess::addArgs(&r.commandLineArguments, + extraAspect<ArgumentsAspect>()->arguments(macroExpander())); r.executable = extraAspect<InterpreterAspect>()->value(); r.environment = extraAspect<EnvironmentAspect>()->environment(); return r; |
