From patchwork Tue Sep 10 23:44:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 21223 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E8BAFC324C for ; Tue, 10 Sep 2024 23:44:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 01C90634FC; Wed, 11 Sep 2024 01:44:53 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="R4phg8xi"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4526F634EB for ; Wed, 11 Sep 2024 01:44:52 +0200 (CEST) Received: from pendragon.ideasonboard.com (213-229-8-243.static.upcbusiness.at [213.229.8.243]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D10995A5 for ; Wed, 11 Sep 2024 01:43:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1726011814; bh=ZwKC5FpQ4p7hrxZkq4+sBSAUnIpwagMg+wupEG34POA=; h=From:To:Subject:Date:From; b=R4phg8xiDzE9DI6QWAqhELPyoNxbHhJG6bT1XGKiGHm9UhNfsnss82CbQU6b4/zPs wZPgbwy8QA/ezZZdFdWLnhJZZZDeC7gaB7OpEaGYqe0ChsnMHcCEgQaDQUF4HU0mTz gVXIhPAw8FRUoieR16mi8Kv4O94Wv8ZHw/a3hMoM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH] qcam: Drop Qt version checks Date: Wed, 11 Sep 2024 02:44:16 +0300 Message-ID: <20240910234416.28374-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.44.2 MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The Qt version checks to support different minor Qt5 versions are not needed anymore, now that we switched to Qt6. Drop them. Signed-off-by: Laurent Pinchart Reviewed-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Neal Gompa --- src/apps/qcam/main_window.cpp | 10 ---------- src/apps/qcam/viewfinder_qt.cpp | 4 ---- 2 files changed, 14 deletions(-) base-commit: f75b8dd26feaca86701704390dea18c71e2f0350 diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp index d515beeda275..dd2aa19618a1 100644 --- a/src/apps/qcam/main_window.cpp +++ b/src/apps/qcam/main_window.cpp @@ -37,16 +37,6 @@ using namespace libcamera; -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -/* - * Qt::fixed was introduced in v5.14, and ::fixed deprecated in v5.15. Allow - * usage of Qt::fixed unconditionally. - */ -namespace Qt { -constexpr auto fixed = ::fixed; -} /* namespace Qt */ -#endif - /** * \brief Custom QEvent to signal capture completion */ diff --git a/src/apps/qcam/viewfinder_qt.cpp b/src/apps/qcam/viewfinder_qt.cpp index b0d63f3fa5ea..e7bd8af941f3 100644 --- a/src/apps/qcam/viewfinder_qt.cpp +++ b/src/apps/qcam/viewfinder_qt.cpp @@ -27,15 +27,11 @@ static const QMap nativeFormats { -#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) { libcamera::formats::ABGR8888, QImage::Format_RGBX8888 }, { libcamera::formats::XBGR8888, QImage::Format_RGBX8888 }, -#endif { libcamera::formats::ARGB8888, QImage::Format_RGB32 }, { libcamera::formats::XRGB8888, QImage::Format_RGB32 }, -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) { libcamera::formats::RGB888, QImage::Format_BGR888 }, -#endif { libcamera::formats::BGR888, QImage::Format_RGB888 }, { libcamera::formats::RGB565, QImage::Format_RGB16 }, };