diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-28 16:10:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-28 16:10:23 +0200 |
| commit | c8c6b28e225c17d1ec9a0d9ce13220a610cfa7c7 (patch) | |
| tree | 4abcf5b716f2f3bad7cde28df67bf4ae18ca3500 /src/plugins/pythoneditor/pythoneditorplugin.cpp | |
| parent | 005b0c1147813aa518a617b31cab3ecec058618a (diff) | |
| parent | c1c57f0c383f88451d1b6c8fe83caa6f2f071048 (diff) | |
| download | qt-creator-c8c6b28e225c17d1ec9a0d9ce13220a610cfa7c7.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
| -rw-r--r-- | src/plugins/pythoneditor/pythoneditorplugin.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 782d96049b..f3375a67c9 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -43,7 +43,6 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> #include <projectexplorer/projectnodes.h> -#include <projectexplorer/runnables.h> #include <projectexplorer/target.h> #include <projectexplorer/task.h> #include <projectexplorer/taskhub.h> @@ -296,7 +295,7 @@ void PythonRunConfiguration::fillConfigurationLayout(QFormLayout *layout) const Runnable PythonRunConfiguration::runnable() const { - StandardRunnable r; + Runnable r; QtcProcess::addArg(&r.commandLineArguments, mainScript()); QtcProcess::addArgs(&r.commandLineArguments, extraAspect<ArgumentsAspect>()->arguments()); r.executable = extraAspect<InterpreterAspect>()->value(); |