From b2076ca71e06f6f20a421c5068a76d38a8f9748c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 5 May 2015 16:39:28 +0200 Subject: [PATCH] ShellCommandPage: Handle reject Change-Id: I310b55a4832c169df68d5fd13311bba66dbd973f Reviewed-by: Orgad Shaneh --- src/libs/utils/shellcommandpage.cpp | 9 +++++++++ src/libs/utils/shellcommandpage.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/libs/utils/shellcommandpage.cpp b/src/libs/utils/shellcommandpage.cpp index 9185939f1af..19f8a942c02 100644 --- a/src/libs/utils/shellcommandpage.cpp +++ b/src/libs/utils/shellcommandpage.cpp @@ -151,6 +151,15 @@ void ShellCommandPage::terminate() m_command->cancel(); } +bool ShellCommandPage::handleReject() +{ + if (!isRunning()) + return false; + + terminate(); + return true; +} + bool ShellCommandPage::isComplete() const { return m_state == Succeeded; diff --git a/src/libs/utils/shellcommandpage.h b/src/libs/utils/shellcommandpage.h index f648728debb..a9b727774a8 100644 --- a/src/libs/utils/shellcommandpage.h +++ b/src/libs/utils/shellcommandpage.h @@ -62,6 +62,8 @@ public: void terminate(); + bool handleReject(); + signals: void finished(bool success);