{"id":21223,"url":"https://patchwork.libcamera.org/api/1.1/patches/21223/?format=json","web_url":"https://patchwork.libcamera.org/patch/21223/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","date":"2024-09-10T23:44:16","name":"qcam: Drop Qt version checks","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3d7981ec998ab804bbe0f33aeb20358f3e3a5fa8","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21223/mbox/","series":[{"id":4577,"url":"https://patchwork.libcamera.org/api/1.1/series/4577/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4577","date":"2024-09-10T23:44:16","name":"qcam: Drop Qt version checks","version":1,"mbox":"https://patchwork.libcamera.org/series/4577/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21223/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21223/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E8BAFC324C\n\tfor ;\n\tTue, 10 Sep 2024 23:44:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 01C90634FC;\n\tWed, 11 Sep 2024 01:44:53 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4526F634EB\n\tfor ;\n\tWed, 11 Sep 2024 01:44:52 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(213-229-8-243.static.upcbusiness.at [213.229.8.243])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D10995A5\n\tfor ;\n\tWed, 11 Sep 2024 01:43:34 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"R4phg8xi\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726011814;\n\tbh=ZwKC5FpQ4p7hrxZkq4+sBSAUnIpwagMg+wupEG34POA=;\n\th=From:To:Subject:Date:From;\n\tb=R4phg8xiDzE9DI6QWAqhELPyoNxbHhJG6bT1XGKiGHm9UhNfsnss82CbQU6b4/zPs\n\twZPgbwy8QA/ezZZdFdWLnhJZZZDeC7gaB7OpEaGYqe0ChsnMHcCEgQaDQUF4HU0mTz\n\tgVXIhPAw8FRUoieR16mi8Kv4O94Wv8ZHw/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","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Qt version checks to support different minor Qt5 versions are not\nneeded anymore, now that we switched to Qt6. Drop them.\n\nSigned-off-by: Laurent Pinchart \n---\n src/apps/qcam/main_window.cpp | 10 ----------\n src/apps/qcam/viewfinder_qt.cpp | 4 ----\n 2 files changed, 14 deletions(-)\n\n\nbase-commit: f75b8dd26feaca86701704390dea18c71e2f0350","diff":"diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\nindex d515beeda275..dd2aa19618a1 100644\n--- a/src/apps/qcam/main_window.cpp\n+++ b/src/apps/qcam/main_window.cpp\n@@ -37,16 +37,6 @@\n \n using namespace libcamera;\n \n-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)\n-/*\n- * Qt::fixed was introduced in v5.14, and ::fixed deprecated in v5.15. Allow\n- * usage of Qt::fixed unconditionally.\n- */\n-namespace Qt {\n-constexpr auto fixed = ::fixed;\n-} /* namespace Qt */\n-#endif\n-\n /**\n * \\brief Custom QEvent to signal capture completion\n */\ndiff --git a/src/apps/qcam/viewfinder_qt.cpp b/src/apps/qcam/viewfinder_qt.cpp\nindex b0d63f3fa5ea..e7bd8af941f3 100644\n--- a/src/apps/qcam/viewfinder_qt.cpp\n+++ b/src/apps/qcam/viewfinder_qt.cpp\n@@ -27,15 +27,11 @@\n \n static const QMap nativeFormats\n {\n-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)\n \t{ libcamera::formats::ABGR8888, QImage::Format_RGBX8888 },\n \t{ libcamera::formats::XBGR8888, QImage::Format_RGBX8888 },\n-#endif\n \t{ libcamera::formats::ARGB8888, QImage::Format_RGB32 },\n \t{ libcamera::formats::XRGB8888, QImage::Format_RGB32 },\n-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)\n \t{ libcamera::formats::RGB888, QImage::Format_BGR888 },\n-#endif\n \t{ libcamera::formats::BGR888, QImage::Format_RGB888 },\n \t{ libcamera::formats::RGB565, QImage::Format_RGB16 },\n };\n","prefixes":[]}