[{"id":31159,"web_url":"https://patchwork.libcamera.org/comment/31159/","msgid":"<40544818-69bb-40e3-8ad3-3cdcd54c2a41@ideasonboard.com>","date":"2024-09-11T04:35:08","subject":"Re: [PATCH] qcam: Drop Qt version checks","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Laurent\n\nThanks for the patch\n\nOn 11/09/24 5:14 am, Laurent Pinchart wrote:\n> The Qt version checks to support different minor Qt5 versions are not\n> needed anymore, now that we switched to Qt6. Drop them.\n>\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Umang Jain \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> diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\n> index 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> */\n> diff --git a/src/apps/qcam/viewfinder_qt.cpp b/src/apps/qcam/viewfinder_qt.cpp\n> index 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>\n> base-commit: f75b8dd26feaca86701704390dea18c71e2f0350","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 BFFF0C324C\n\tfor ;\n\tWed, 11 Sep 2024 04:35:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 57CDB634FC;\n\tWed, 11 Sep 2024 06:35:14 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 57E58618F1\n\tfor ;\n\tWed, 11 Sep 2024 06:35:13 +0200 (CEST)","from [IPV6:2405:201:2015:f873:c173:4b:4a04:3a21] (unknown\n\t[IPv6:2405:201:2015:f873:c173:4b:4a04:3a21])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BE7135B3;\n\tWed, 11 Sep 2024 06:33:55 +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=\"KFJS2aDN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726029236;\n\tbh=NQlweidCZ2Qb+TNYjgN3SzVtHaA+jmuLKhOQrx9VhhQ=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=KFJS2aDNC+gKTcthNYdpwssAzuYvQCuhXmw2bBP5tqm/G5H6TSjENp7UODyZebPZH\n\tmUYH38pnHAW+Z3CWNNpVldt6t0NUEd90pbklyPVD3arm9p6uf1AxmgxtUq4B5yLeNQ\n\tbACwVoPrbKbDaOqwNjDbsavTP3TzykpSGtjV0Pig=","Message-ID":"<40544818-69bb-40e3-8ad3-3cdcd54c2a41@ideasonboard.com>","Date":"Wed, 11 Sep 2024 10:05:08 +0530","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH] qcam: Drop Qt version checks","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","Content-Language":"en-US","From":"Umang Jain ","In-Reply-To":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","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\" "}},{"id":31162,"web_url":"https://patchwork.libcamera.org/comment/31162/","msgid":"<172604124525.839693.14608121987311431152@ping.linuxembedded.co.uk>","date":"2024-09-11T07:54:05","subject":"Re: [PATCH] qcam: Drop Qt version checks","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2024-09-11 00:44:16)\n> The Qt version checks to support different minor Qt5 versions are not\n> needed anymore, now that we switched to Qt6. Drop them.\n\n\nReviewed-by: Kieran Bingham \n\n> \n> Signed-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> diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\n> index 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> */\n> diff --git a/src/apps/qcam/viewfinder_qt.cpp b/src/apps/qcam/viewfinder_qt.cpp\n> index 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> { libcamera::formats::ABGR8888, QImage::Format_RGBX8888 },\n> { libcamera::formats::XBGR8888, QImage::Format_RGBX8888 },\n> -#endif\n> { libcamera::formats::ARGB8888, QImage::Format_RGB32 },\n> { libcamera::formats::XRGB8888, QImage::Format_RGB32 },\n> -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)\n> { libcamera::formats::RGB888, QImage::Format_BGR888 },\n> -#endif\n> { libcamera::formats::BGR888, QImage::Format_RGB888 },\n> { libcamera::formats::RGB565, QImage::Format_RGB16 },\n> };\n> \n> base-commit: f75b8dd26feaca86701704390dea18c71e2f0350\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","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 E237FBF415\n\tfor ;\n\tWed, 11 Sep 2024 07:54:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9B68B634FC;\n\tWed, 11 Sep 2024 09:54:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A05A3634E3\n\tfor ;\n\tWed, 11 Sep 2024 09:54:07 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 291065B3;\n\tWed, 11 Sep 2024 09:52:50 +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=\"IveXvviL\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726041170;\n\tbh=wLnrMuJZy3xEKYS5TDAWQtuND2R+AYfhyMmmzUafsJU=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=IveXvviLBu+xCbeQc0F5pveg+D/ybQAxt1CygpCmta1Bxe5JjKaiAyv5zz9xZV0y5\n\tJ8XZjSlSWQSZNQCr60ZB9lEsCJduj2uPSUiVBSXxBbbLIaLWqefjazhEw5GKSXAZl8\n\tDXN3/oCGrGGlS0oyYeJ0yFmkIy9vylW24onr6NlU=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","References":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [PATCH] qcam: Drop Qt version checks","From":"Kieran Bingham ","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Wed, 11 Sep 2024 08:54:05 +0100","Message-ID":"<172604124525.839693.14608121987311431152@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}},{"id":31169,"web_url":"https://patchwork.libcamera.org/comment/31169/","msgid":"","date":"2024-09-11T13:47:16","subject":"Re: [PATCH] qcam: Drop Qt version checks","submitter":{"id":181,"url":"https://patchwork.libcamera.org/api/people/181/","name":"Neal Gompa","email":"neal@gompa.dev"},"content":"On Wed, Sep 11, 2024 at 1:44 AM Laurent Pinchart\n wrote:\n>\n> The Qt version checks to support different minor Qt5 versions are not\n> needed anymore, now that we switched to Qt6. Drop them.\n>\n> Signed-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> diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\n> index 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> */\n> diff --git a/src/apps/qcam/viewfinder_qt.cpp b/src/apps/qcam/viewfinder_qt.cpp\n> index 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> { libcamera::formats::ABGR8888, QImage::Format_RGBX8888 },\n> { libcamera::formats::XBGR8888, QImage::Format_RGBX8888 },\n> -#endif\n> { libcamera::formats::ARGB8888, QImage::Format_RGB32 },\n> { libcamera::formats::XRGB8888, QImage::Format_RGB32 },\n> -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)\n> { libcamera::formats::RGB888, QImage::Format_BGR888 },\n> -#endif\n> { libcamera::formats::BGR888, QImage::Format_RGB888 },\n> { libcamera::formats::RGB565, QImage::Format_RGB16 },\n> };\n>\n> base-commit: f75b8dd26feaca86701704390dea18c71e2f0350\n\nReviewed-by: Neal Gompa ","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 8A04FBF415\n\tfor ;\n\tWed, 11 Sep 2024 13:48:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D6AE1634F9;\n\tWed, 11 Sep 2024 15:47:58 +0200 (CEST)","from mail-ej1-f54.google.com (mail-ej1-f54.google.com\n\t[209.85.218.54])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D5CE7618F2\n\tfor ;\n\tWed, 11 Sep 2024 15:47:56 +0200 (CEST)","by mail-ej1-f54.google.com with SMTP id\n\ta640c23a62f3a-a8d6ac24a3bso183852666b.1\n\tfor ;\n\tWed, 11 Sep 2024 06:47:56 -0700 (PDT)","from mail-ed1-f43.google.com (mail-ed1-f43.google.com.\n\t[209.85.208.43]) by smtp.gmail.com with ESMTPSA id\n\ta640c23a62f3a-a8d25ceaf86sm613037766b.155.2024.09.11.06.47.54\n\tfor \n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tWed, 11 Sep 2024 06:47:54 -0700 (PDT)","by mail-ed1-f43.google.com with SMTP id\n\t4fb4d7f45d1cf-5c241feb80dso1870868a12.0\n\tfor ;\n\tWed, 11 Sep 2024 06:47:54 -0700 (PDT)"],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1726062475; x=1726667275;\n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=x8k5GBiHeHuDVsfPv+bvgB5v86ZNDptvmoj5jf9XGx8=;\n\tb=JWol1sdY4rDAIzfShEFHsIOxPeWsydhk+XT1lRpMZXMK6v9/ObvcB+Rn+0zMtSI6Dt\n\tHKsn6sirboYKdmpy5GMqZAUaceWcevg5uaQ/3S4uAwQ09mvxPXwmuG09V23ds4sRmpYO\n\tphlhOFZHNP/S/r+iCjsl5uvU5alreJBceYrqRU1wZloJaWD+VdwMzAgHGtE73OxIOj4U\n\t3FS9LVi7qpgqtS1HTui+JI1HMAP+cpfWR2gdoT0w/HSPCvAy8vO50W4NiuKP9j1LrPwV\n\tPhNS0KjjSwiFg77nagy9+afDw0Dv/2OhdQM/tSU0eYMvtPVp8FC9Nd/xswgN1tV04tEX\n\t1Pbw==","X-Gm-Message-State":"AOJu0YwintQXoVkrUn00U/YLeUsYxCmFqvV3OQfoNEIGLE1s0Pe77Lwj\n\tpXgnh+nxSSpP92P8l4+qwMjoXi6lkB83H1ukavXr18UtdmECfx42MGF4QGzFhIx/fg==","X-Google-Smtp-Source":"AGHT+IE8m1zKfoxs1zjAqMhyGsVrpm3MrZidnCmP1mrx6IRioO4g6lZNyp5In44i9iPbSOb2EDLmfA==","X-Received":["by 2002:a17:907:944b:b0:a8a:87d5:2f49 with SMTP id\n\ta640c23a62f3a-a8ffae3a20cmr432947066b.28.1726062475084; \n\tWed, 11 Sep 2024 06:47:55 -0700 (PDT)","by 2002:a05:6402:208a:b0:5c3:3f6a:8667 with SMTP id\n\t4fb4d7f45d1cf-5c4015ef243mr7281208a12.15.1726062474839;\n\tWed, 11 Sep 2024 06:47:54 -0700 (PDT)"],"MIME-Version":"1.0","References":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","In-Reply-To":"<20240910234416.28374-1-laurent.pinchart@ideasonboard.com>","From":"Neal Gompa ","Date":"Wed, 11 Sep 2024 15:47:16 +0200","X-Gmail-Original-Message-ID":"","Message-ID":"","Subject":"Re: [PATCH] qcam: Drop Qt version checks","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"quoted-printable","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\" "}}]