summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-09-04 08:38:44 +0200
committerhjk <hjk@qt.io>2018-09-04 11:02:49 +0000
commit25400751a4b4cd03758862b8365f57e8afed7985 (patch)
treecbca0d539027c09fc2cdbfd99672bb83085901e1 /src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
parent760e6a9b13a666ba37edd981f9d752755a744b0d (diff)
downloadqt-creator-25400751a4b4cd03758862b8365f57e8afed7985.tar.gz
ProjectExplorer: Remove RunConfiguration::fillConfigurationLayout
Instead of using a hard-coded list of well-known (optional) aspects, add all aspects, so there is no need for special treatment of RunConfiguration with unusual/custom aspects needed. Price and benefit is that the individual run configs are again responsible for the aspect display order which is determined from the aspect construction order. Change-Id: Iff2656b2e358c0f0f789d4c006a5c44d0a1536a5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/customexecutablerunconfiguration.cpp')
-rw-r--r--src/plugins/projectexplorer/customexecutablerunconfiguration.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 310c5fb0ec..42393a23db 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -139,8 +139,8 @@ void CustomExecutableDialog::accept()
{
auto executable = FileName::fromString(m_executableChooser->path());
m_rc->extraAspect<ExecutableAspect>()->setExecutable(executable);
- m_rc->extraAspect<WorkingDirectoryAspect>()->copyFrom(&m_workingDirectory);
m_rc->extraAspect<ArgumentsAspect>()->copyFrom(&m_arguments);
+ m_rc->extraAspect<WorkingDirectoryAspect>()->copyFrom(&m_workingDirectory);
m_rc->extraAspect<TerminalAspect>()->copyFrom(&m_terminal);
QDialog::accept();
@@ -187,8 +187,8 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *targe
addExtraAspect(exeAspect);
addExtraAspect(new ArgumentsAspect(this));
- addExtraAspect(new TerminalAspect(this));
addExtraAspect(new WorkingDirectoryAspect(this));
+ addExtraAspect(new TerminalAspect(this));
connect(envAspect, &EnvironmentAspect::environmentChanged,
this, [exeAspect, envAspect] { exeAspect->setEnvironment(envAspect->environment()); });