diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-08-28 21:15:18 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-09-02 11:49:08 +0200 |
| commit | 27e53f746f9ffaee13f167619ad4061dc442abd5 (patch) | |
| tree | d565cbc490d7e263bf7d9c65b74162ab7cf34633 /src/plugins/vcsbase/command.cpp | |
| parent | 0aae98fb1379ef3a9a4f29db0d7cb61245e5633b (diff) | |
| download | qt-creator-27e53f746f9ffaee13f167619ad4061dc442abd5.tar.gz | |
VCS: Enable terminating a command
Change-Id: I2160a22e300aca9b38e28257375c8e0be2026d12
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/vcsbase/command.cpp')
| -rw-r--r-- | src/plugins/vcsbase/command.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp index 57d36c3575..97532a9331 100644 --- a/src/plugins/vcsbase/command.cpp +++ b/src/plugins/vcsbase/command.cpp @@ -213,6 +213,11 @@ void Command::execute() Core::ICore::progressManager()->addTask(task, taskName, binary + QLatin1String(".action")); } +void Command::terminate() +{ + emit doTerminate(); +} + bool Command::lastExecutionSuccess() const { return d->m_lastExecSuccess; @@ -346,8 +351,8 @@ Utils::SynchronousProcessResponse Command::runVcs(const QStringList &arguments, if (d->m_flags & VcsBasePlugin::FullySynchronously) { response = runSynchronous(arguments, timeoutMS); } else { - // Run, connect stderr to the output window Utils::SynchronousProcess process; + connect(this, SIGNAL(doTerminate()), &process, SLOT(terminate())); if (!d->m_workingDirectory.isEmpty()) process.setWorkingDirectory(d->m_workingDirectory); |