summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/runconfigurationaspects.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-04-24 16:00:53 +0200
committerhjk <hjk@qt.io>2018-04-26 13:58:00 +0000
commit98b026f9a97d3a2311eb6ec5e88b20dbd76f3e26 (patch)
treec0e48c11322a5028d5a8035ceba16d0c3f0eaaf8 /src/plugins/projectexplorer/runconfigurationaspects.cpp
parent219e23332e5e21d3e4e1a9334bf3f5ef1d485b59 (diff)
downloadqt-creator-98b026f9a97d3a2311eb6ec5e88b20dbd76f3e26.tar.gz
ProjectExplorer: Rework CustomExecutableRunConfiguration
Split the run config widget according to the two use cases (direct apply, delayed apply). As basically most data members and important logic was not shared, the double-use made the CustomExecutableRunConfiguration implementation needlessly complicated. Change-Id: If92ba22bae31378bae29049e0d27095b2bbd6090 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/runconfigurationaspects.cpp')
-rw-r--r--src/plugins/projectexplorer/runconfigurationaspects.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 58ffc961f2..ac04928465 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -80,6 +80,9 @@ void TerminalAspect::fromMap(const QVariantMap &map)
} else {
m_userSet = false;
}
+
+ if (m_checkBox)
+ m_checkBox->setChecked(m_useTerminal);
}
void TerminalAspect::toMap(QVariantMap &data) const
@@ -182,6 +185,9 @@ void WorkingDirectoryAspect::fromMap(const QVariantMap &map)
if (m_workingDirectory.isEmpty())
m_workingDirectory = m_defaultWorkingDirectory;
+
+ if (m_chooser)
+ m_chooser->setFileName(m_workingDirectory.isEmpty() ? m_defaultWorkingDirectory : m_workingDirectory);
}
void WorkingDirectoryAspect::toMap(QVariantMap &data) const
@@ -275,6 +281,9 @@ void ArgumentsAspect::fromMap(const QVariantMap &map)
m_arguments = QtcProcess::joinArgs(args.toStringList(), OsTypeLinux);
else
m_arguments = args.toString();
+
+ if (m_chooser)
+ m_chooser->setText(m_arguments);
}
void ArgumentsAspect::toMap(QVariantMap &map) const