From patchwork Thu Feb 6 15:05:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 2788 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A52E600FB for ; Thu, 6 Feb 2020 16:05:10 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 234F01227; Thu, 6 Feb 2020 16:05:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1581001510; bh=EK7IMDyzHjDuX4N6XYWlzj+eItFvFg/2ZwLUsobG3Dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lu4b6BjRAQW96rGxPzczx0PkbsgAJn4qXpmCUhcXQM726xnfD/3pyQ2oh8C83Ozx4 OcdULQKQzllKUPCE8fxwSwoba7sWr6PihMmaS4SloKLZqT3UB6WCnLu4JW+q4uw9Un aojiD5BQSbnLaXhaj2dd2/H84Y1Qz2irovK0i1A8= From: Kieran Bingham To: LibCamera Devel Date: Thu, 6 Feb 2020 15:05:00 +0000 Message-Id: <20200206150504.24204-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200206150504.24204-1-kieran.bingham@ideasonboard.com> References: <20200206150504.24204-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/6] qcam: Expose quit method for MainWindow X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2020 15:05:10 -0000 Provide a method to facilitate clean shutdowns. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/qcam/main_window.cpp | 9 +++++++-- src/qcam/main_window.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 38bc04a23b86..b51a16de199d 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -41,8 +41,7 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) } if (ret < 0) - QTimer::singleShot(0, QCoreApplication::instance(), - &QCoreApplication::quit); + quit(); } MainWindow::~MainWindow() @@ -54,6 +53,12 @@ MainWindow::~MainWindow() } } +void MainWindow::quit() +{ + QTimer::singleShot(0, QCoreApplication::instance(), + &QCoreApplication::quit); +} + void MainWindow::updateTitle() { unsigned int duration = frameRateInterval_.elapsed(); diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 04fb9e3ea869..a11443b30b37 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -41,6 +41,7 @@ public: ~MainWindow(); private Q_SLOTS: + void quit(); void updateTitle(); private: