From f66770cde19579d2e6f2dc88ba9bb6abfe0d821f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 12 Sep 2018 10:09:41 +0200
Subject: 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>
---
 src/plugins/pythoneditor/pythoneditorplugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')

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;
-- 
cgit v1.2.1