From patchwork Sat Apr 15 20:10:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A142C77B73 for ; Sat, 15 Apr 2023 20:11:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229795AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbjDOULA (ORCPT ); Sat, 15 Apr 2023 16:11:00 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 057F0358C for ; Sat, 15 Apr 2023 13:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589457; i=ps.report@gmx.net; bh=da3N34QHsJeDnuEYf8KQ3UM5GlyFmh7SYmZX2qivMso=; h=X-UI-Sender-Class:From:To:Subject:Date; b=JeatWW8aiXCM1tvnJTRcc4nMEcZ9CYaIJmZBtoPLbPOdRg/AkjCWJiVa7mT2jvbxc 3qX+WamH5jEpByBxbxssScwSg+uH0k2ZSKqt90hg3VzoxoIYn+bpuI5GMGtKKDmTUJ qD8+DTuWiOD7c0cYdnbiWMzbx5OZ7RW4JCDQaYxAUeuk7Jga1J98Ry5ntGxfSz9k7+ B2rlbrh8rb+M4RKPz8Q222sTbfwoOVtPPCrcgq5OWtaC6CPwPVzXvHreTOuPfQJ7Ks A1CSTRqDimaH/XNy+D4c6aQPrxEvU2SChEKeaRJSg6SDWK+44Dq1NrcDOvU1rwbun3 K4239DQczzSBQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mz9Ux-1qZZh40l4V-00wG8K for ; Sat, 15 Apr 2023 22:10:57 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 01/11] qv4l2: remove leagcy alsa_stream.h include (ENABLE_ALSA protected) Date: Sat, 15 Apr 2023 22:10:46 +0200 Message-Id: <20230415201056.31080-1-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:QI4Ht54NO/nYu0rrgAyU462YWUW4VYeYyNdHwEK9U8vmsT8A+Fv pLFddyR0pY27IBB2jhmUvc75TvQVcTel+ZnGs/DGDMbaH2V89LbrMZo3+sWMlokNi6xZQ7S a5pD1jRD+bxcUnruY/Ll+qTC2g6ZX1/tdy0LF+gvUMzavusWQ5I0ptO6XpKFkJiZZhbv/f2 mbkTKbhKqbGYxESZpJ6WQ== UI-OutboundReport: notjunk:1;M01:P0:kl6vmwmrXb8=;ro5yblZs/+HB/K547wko2h84Sl6 lnwjRmMr5R4MjoKzZjzXsj9W5SJQk3/mvgLZrH3CN3v1XiC2y2LQg/4pqDWazyytVuPxE7tQ6 AFHFMNq/xI2PWbX+SUWrBhVu0EXEr4cdYvU1A80ww09Cukz+hEeXnW+5mlkEatIqUOs71rBeE BpfvzK1FefLQeDz3ghClyEYqWlrHR1mQwsOr4NnSeLurlA42r3NiSKpCJuCENaBBB/Xved3yK m/c4EX+7BVh8LfaBazKKgGwv0TY2aOMUAADJkrqA/lu79lZ7a7zv7NFojHAFYK1PrtDJ9xNxI MgYW11uXITM+kfGw0ur+V48OE+l22ZiyPrVD71k2Pb4PuYXiGCmnBe1DP+8Gf3vue3kJH3m5A ah18jNyFFOAZmV5FMZ/bLCPvuZHUNT6Q3fBjMukOC+cm/KEPC8TUzClRiBz/GCpBJRyW8rplg Ud0rQU/fWiBhQfGPFEEaJi1IrIsJW+bjHxSu3Br+lJWkzDvbZaLlTCBCMSr3+kYRZFoSiRitO LfYUlMQa36gjkvfkAJwQ85y8gupG914vq5hlHMPah8oADGaHJ9cp+j8aT4eA9e3ezz1lQ6c3Q c4QkFmv5738J5lzbrNG719nnxIRVYx2yo4uyAm6lBLsIX7Dgg9RFQ0+cF4Nz64RUVku9iy8wB bXmBzFFGnZCjrM7Tj/Xc09uK2XcP9jhPIB21f877ERmdZWTBNxFnl1Lg1DYk3/+IFCSfty//k jBSZvpfD6J608WPveMVTGGw4g6Ec648ElkC8PuzE2V2yRH8X0u1rCaRzx+kzWVPBho4LTZDxH qc83et43ffo14MROkwa/nGIJR78faHctEP59LZcY2zfOnsotGNiqHzKuXPCHFNV+pc3FxXoyW 8Xr4SkLNcxxWArUvWX5Ga378r0F7bHVNq0Wbogj4DDPLjPg5nXHZi4ADFBoT0JKn3OBIXZ5d+ p6OQAeuHkLGBdcZvUWMKgGwP1G0= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Remove leagcy alsa_stream.h include protected by legacy/unknown '#ifdef ENABLE_ALSA'. Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index 4cbaa98e..ea1ac201 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -17,12 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef ENABLE_ALSA -extern "C" { -#include "alsa_stream.h" -} -#endif - #include #include #include From patchwork Sat Apr 15 20:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F11CC77B73 for ; Sat, 15 Apr 2023 20:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229760AbjDOULA (ORCPT ); Sat, 15 Apr 2023 16:11:00 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 321183599 for ; Sat, 15 Apr 2023 13:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589457; i=ps.report@gmx.net; bh=NM/C8G2lRBz0Gw0CGsVX9ntJubBtKRBkFtlFehYmRg4=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=XCYmKuzLRb1I2eUvixhvz17kS5AV+NLkp5p97DJ+xCXinksLPB2+M+GdsWMFYrFMm Hw1CtgVQ9selNpoU1/3a2DSMpt7kUz2G0MSYFcFTiJoVxywCRrd3pb/zvoiV/y4StQ FGJ1h47X+zxzNLI7FB51cz8+zQrZteb9WqM7QqLAv65pvI14hCsqFjYi4G8VVTr+0m xURAeJVESWrtceA0X66Y2JLmlvcrJN3R5pqXStgBmX5r0vgLDLP4RH2hw34+Bu0uAq WQRXWoXOMGEAmJZed5oKP2xAqe8NvcqOLmC1b/2PrL/04jTqAafZxQGj4wtaTzZXvI eTqLwaW98xUbQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mw9UK-1qfsI91gLE-00s6zr for ; Sat, 15 Apr 2023 22:10:57 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 02/11] qv4l2: fix qmake project file Date: Sat, 15 Apr 2023 22:10:47 +0200 Message-Id: <20230415201056.31080-2-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:uEKAXQnwQ4YrEJVxIE+uh/sg0T3afDRLELTypvm9zfdsXSlVeAg HBSBCb1qAe4HWceLeMhJV9UxgWqeGuxCIbQ+vRjxckaqqekGTjHt+rNzdU1PuyVnXD+McEh ChqGnay5C8iDjORh9dS1mSCTZdEwGUZhK39o1snAK3jLRfOQTD2KhEXFuqiKfwXwqhYsq69 3iqnTr/SpD/wzYBJHEszQ== UI-OutboundReport: notjunk:1;M01:P0:YgE8dQH4PoU=;9i3UxWyXgnOEpa5ugamP2GANT4+ 7HBtb6Aq4XGQlsuRSNpLr5nMyedPK2MWNVhGaFpf/cIyo2cq6mtQU/SVh4y0B7v5POIZMSU4b p83dGzsim0E+8y8JAUQw6+jcv9kyF3YWG0YyShTJW8xU6zaXmA9hoT/53/kdn/Qq2OgL1CwAu hHKQTWYV+/Q8RnvFnSw+W3XMt/LNkQY5oFK6Q3O3QYZP2NxUHlax4O3ZuNGLesafK8BRL7uUt UI8IJ8/Ilu8jLL4lgwnNvObD82sVLEk1ONNVLg8II2qYBRKj1sz4qPHsFbauD+gFW3sXVqjFO 4Pv9bFxDYGt5yaLMiF35MozAop4nMgJjmOn4LailtuhV6SWiy2iOsrjlpE9OgeofqO/koEa2s DrQbdshaA1L+pvxHyC25Ei9SZcRy35wMUXYIeanMIxC8OF7PEw9TYROVDxaKnMzPRNLMW+2H5 zCYDU33kBic8rad3WSnv7n9q/qhhrxjLzz77zdmJjj7tp5Lk9E2pTOjhbONf9NZrJvwjyuSAY jOMa9ZpcoMHFDiAJF4rfUoqDQvF11I5M9WV4nIIUHMRtz9RF8q2OJntMlqtjk08py4G9hmhSd flQqXydQv3tiBV/bOHXPGNuMu6FbA9Q5qePwbQdM8hBDDSZX+tOPNItly7ggERUfaNGcK7d2Z XwnZsO7hp5purhFdRqVf+d1Mo9oeLkt2gj0GI18Gaal7QePcMa8xFQkw4fgfDKz64sHtyJ6FU JY8Di9jcr37G33CygmKyBadU6f9BcWoooNLEZpj6DsjZULMwh0NKzRLVx4feidkMWdaBk6ZRy /hwid0cKqOw+LtzvJhNrZuFDsLuHBeiVSZoQD79MAIyDqQRC3UHTxDAQbaeHs4sIg90nYszFJ XWSh63jeyoesXUC/mLefSlBh1PWbPM7+9+NgRAWT42mBoNJPoopJrlv693FvcPQ1LEgiuMhjg MtreZ1lzhAXavWR/h7Z57EWPfLA= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org - add MESON_BUILD_PATH variable (and customize hint) - add '-include' for config.h file (as the meson build does) - add alsa_stream.c source file - adjust local library file paths - add libasound dependency Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.pro | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 6420fa24..8697d554 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -8,10 +8,16 @@ CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +# adjust to your local meson build path +MESON_BUILD_PATH = $$PWD/build-meson + # opengl: to disable opengl suppport comment out the following # line and the line '#define HAVE_QTGL 1' from ../../config.h QT += opengl +QMAKE_CFLAGS += -include $$MESON_BUILD_PATH/config.h +QMAKE_CXXFLAGS += -include $$MESON_BUILD_PATH/config.h + INCLUDEPATH += $$PWD/../.. INCLUDEPATH += $$PWD/../common INCLUDEPATH += $$PWD/../v4l2-ctl/ @@ -28,8 +34,9 @@ HEADERS += raw2sliced.h HEADERS += vbi-tab.h HEADERS += ../common/v4l2-tpg.h HEADERS += ../common/v4l2-tpg-colors.h -HEADERS += ../../config.h +HEADERS += $$MESON_BUILD_PATH/config.h +SOURCES += alsa_stream.c SOURCES += capture-win.cpp SOURCES += capture-win-gl.cpp SOURCES += capture-win-qt.cpp @@ -42,9 +49,11 @@ SOURCES += vbi-tab.cpp SOURCES += ../v4l2-ctl/v4l2-tpg-core.c SOURCES += ../v4l2-ctl/v4l2-tpg-colors.c -LIBS += -L$$PWD/../../lib/libv4l2/.libs -lv4l2 -LIBS += -L$$PWD/../../lib/libv4lconvert/.libs -lv4lconvert -LIBS += -L$$PWD/../libv4l2util/.libs -lv4l2util +LIBS += -L$$MESON_BUILD_PATH/lib/libv4l2 -lv4l2 +LIBS += -L$$MESON_BUILD_PATH/lib/libv4lconvert -lv4lconvert +LIBS += -L$$MESON_BUILD_PATH/utils/libv4l2util -lv4l2util +LIBS += -L$$MESON_BUILD_PATH/utils/libmedia_dev -lmedia_dev +LIBS += -lasound # comment out in case alsa sound support is disabled/not available LIBS += -lrt -ldl -ljpeg RESOURCES += qv4l2.qrc From patchwork Sat Apr 15 20:10:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212642 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30A6AC77B70 for ; Sat, 15 Apr 2023 20:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbjDOULD (ORCPT ); Sat, 15 Apr 2023 16:11:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229773AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AA9135AA for ; Sat, 15 Apr 2023 13:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589457; i=ps.report@gmx.net; bh=Mi/0Y/IY3iN+Mcv0hGw0f91+uTQ4LLLSS75q6F0OclM=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=o+cDSWIYB5QOY9b/FFN8FhVeU21BR+ML3kQ4Ak9dlALm6yKz8nJddX9B8DPXEm+CV L6AemO6WmmNP3BAjMOs8dArnvPJ0pILtUKJxwDWf1JtSnIkW3MjMp+NafnD4aMHnO/ +73FbS+CJFBO5TABwkrRzCbmMMz9g/1XSGbw7Ujs//IJK5GvCMMtqsotv71+//iubv ewOjhq7qT5wEHdK6YLzHuApGyEb7+/YbGpKXCrEcfK9RaW084lI/gk9Y9s74RELAQM xEAmi+yIGeroQS4Gs7UdHYyMEVua611iB6AAZ728u5EvKf4i2PzosOfJNv80WqqWmg 3aZli7adI4cZw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M9nxt-1pkDSe2SiD-005nfe for ; Sat, 15 Apr 2023 22:10:57 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 03/11] qv4l2: update qmake project file for Qt6 (core5compat module) Date: Sat, 15 Apr 2023 22:10:48 +0200 Message-Id: <20230415201056.31080-3-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:1D88osFGWnEYWMeKy5CTykchfT+3C1m5W11I4kkLIU20dX7ex+K D2oTj8+A7tzXfwiyMKhUoexmKOV0qogJWJy3dXjJ0IxOiJ+zRohMwjGXFkmHxQu9Rv6uGZt WsAPzh3oBKuCapSlhr9g4OuinvdbpzpYQloIWtg6G2n1QOrT5lBYqyO6y2BpOJMXa1tGwUQ IBvL0lLurV2OnTxwqZzKQ== UI-OutboundReport: notjunk:1;M01:P0:IUeSmilBzh4=;u0QtrPJuKryZI16pnOFhNLwOKM7 wzVgkKRQ+JmSKikSIV6gVr8ljHDJKY1I3M20JXN4djNVWDGH8mY+yn730ie63377vi2LmWD9C O4ICJtjCfP7RfbQehzR2IIVI8aVwGPkaguFZ7pQDgNn6IDXWrqjqIxwQr5/sfr3zmYRPQcnId ksXix4nd6FU3Rv8mZbEZiUKUZ+fnNOOeBmrqQB9v3xrSnjXvQltttCEE54V9/st9cmIbxeekc B9H0aaVNogZmaV17hc9vJLiZhHVT20WDVU3TIe/zLi7ijsGcQygLuhbkaYUDe4IwLh2kMZZ/7 3zC3Q4SVFeeCX3skhwbYVQ565A5SG3KjJDod2TYhjruqAYv+u4j3Dof7CMZubX4fw5xp1BJAs tRqQ38qTASuNsfy7FAqjtzOBFWxWKoYC+3IhQUvLtrOxcpF/UQAEE+T7WXOwr0UBKdmSVF9jY jKq35fm5pWspMOMBBwn9xIla92Hjo9vQph94nxXmjKhdVDiJFlHQJSZWckkpjmpbB0lAFSsun t4PCiYE2GEs4zbOAsHCja1pF1Xht7iDXoMSMSkPOO6k0gShsW4fLBrQCa1MSxRcnGLlcJ6M1T f1jgzBMZW5Fdts2kgRYNJQ0BIpZ91FLedJZ5Q5JM7Nj/CmQai5xpohF0UzDQLtzh5VLjPsGW3 aCvlSxMITfPeHM0ijhV+AhmfrdurDgCVwjkW1vR4qytz+5+xBpNa8RbyormiLDP8EiXxEm7Ui aWHkm57rSjdLxGWRo+leU4qc1PQCmhRUxzeFwRFuqTMQ0D3cJmOBxdRXgibDF6EHy8U6UD8qp lKL729tZSKFnZvjRz4NrB2SXqzOrZSwFrih1vFwf5Dh4gS+3eF8mz4G/jXQMAf+aVKLgkQDfD /QQyqfOHgFCadD4kzzsgQytNpZCqYTrEnoqcTtgiGtSQK9i1xe2UMD6Bl/cnvJ8Ql/bl4czqO MFZ7egp6Q/DFml6WqDWJG4U5mik= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 8697d554..1ea07374 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -7,6 +7,7 @@ INCLUDEPATH += . ../libv4l2util ../../lib/include ../../include CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat # adjust to your local meson build path MESON_BUILD_PATH = $$PWD/build-meson From patchwork Sat Apr 15 20:10:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212644 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FC92C77B77 for ; Sat, 15 Apr 2023 20:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230009AbjDOULH (ORCPT ); Sat, 15 Apr 2023 16:11:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3A7635AE for ; Sat, 15 Apr 2023 13:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589458; i=ps.report@gmx.net; bh=J3z5STEeOMyfgmsI8eD2HbehKyqxwnmKsBfjxv4mjMc=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=qHkR5Z//tUzVLfZT9uTJ5+fQNVwRpAOBYua00SVUK5tOQ0V7E5dK8ZqxvqCDtciHU H+Lt9JjFuETmIw71LpY2JmJd1dPTgJKSL6ogk254ILU3kpB92e7AYuKMmvSVBVL1Bp ZTdYYDeI0zuetOjCvGKCc8BvQpWA+TBd16Xtaf9CNgROKwIK4ewmZFBawZaxG6JsM5 INbfrza2O8OmI++5dawQBJvHou/YkQbcBbiXfaiNmXIzSBw8hlYnsNIo9AlE5h/Mb3 kQchwqyh8QegfGo2wxeMYBi9MhaYoQAy2N51b+5Rxly0+Y3+v1tWCkLNfnf7EcUtAv xTor7WjW2RcPw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1McY8T-1qLk4q3P5B-00cuQk for ; Sat, 15 Apr 2023 22:10:57 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 04/11] qv4l2: fix Qt6 compile (QDesktopWidget: No such file or directory) Date: Sat, 15 Apr 2023 22:10:49 +0200 Message-Id: <20230415201056.31080-4-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:zY3tyCXpLBxWiJ7uO/ED6evxE9YeMGKn0Lno+TY5F/+8GOmTw9n oLo772o2GU4umUPBhryQ3PbVangtRQiChRmIWLW/aU5bDUEdajUVMrclkHHEbU3J2ozbpwO 7Ds38YlhxXdIMq+7JehqSWhR/DF/FLn8gbtHKDl/vjvvskxTemiNQ+DxjPjWpHNUzp5Fv4B 8pqxVFO8ZKVXDZlvGBrlw== UI-OutboundReport: notjunk:1;M01:P0:vyl5I5cyOSM=;wwLCVQlIcg0+HMSTrfx1E2dsDlH l0ki1Gb+DYVr64DaYZD5RQtyOAh2wms/e8p3c2pYAF0+kysxcDxSOtOL9yWkh7gkbvrmFZQGt ZAaERFK+r2BG2m+QLwLSSEMGE2f7BHWgMUM5JeNGl1/N1v7uIugt558Kr7GWRfAWgRPpIG9wn EbGV9xSTs/e/hJc0Wk5bxpUaX6MaRTORQFF3kqddvuJQWG2EqicbN+X2UFeQFOrBX6Ll8mq38 pO5s81s2ijEKzPf4kqQI5n2JIHyukqkL3oUmhaN2qvTOQboI1AM5LOX/5sFL9kUul6MJJ3S84 8Jcw8qR31Fn0T7VMam0xZgAjb7aq34jcCFKXA8EbISdMkJC/VJZfxOTGrkiCvFzhytE7H2o90 FcWbf2hf1ijK0zXQpgPZKEqSraMWEhk0XmRImEyKYZef8LHynRfioXG8OzgWLUfgBHIwQsBYD 4KAEJcxO8aX+MauGfmCAkiaRKdXqVWI1LTE5lv46f3LaGxDss2FQ/qOrr71EXBAkRZVr/hIp1 PqBxOGAldmNBrcXlvb8QHfenkjN/iB2jGy4SqdRvZTuGsEwqWpYPhqo/lChVkiJYufHLM9zwJ iy7otz+mmglGapKPQgn/M8B6Htaap0Tsx3MBaJ82V+l80F42LOcPeaaQT+4SVSrKL+QbXXRqC xXXD2WLGzjhuU56tsciqIjk2xcphRu/+7vxrEOzkBsv/p7GRgNa94wfdtLAdJgepg1Vt8uSnx dyq0iZu3scLW2YR9kN9dtApyRvXORqmgEP0NtwvtXpk7yuLObhBa9ZuEAbw5clCGw8kHzc62R n2Dn+nHDR+7UUlst/vc9nAZaOPKJ2ObAcnSKkR6Bjt/tb7ZG+TCjG7YBc9EFv3swYry833Vko /AoLVmoxGNSwhFh0b8avg+gexmJgi/r2mlqHtJufqOXvxkPkb+dS0Ij+9DAmizb1RneDY9+LE ATYW5+0Jjp1GWZZiqIIB73p4BK8= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org - include QDesktopWidget only when needed (Qt verson < 5.10, see usage in CaptureWin::setWindowSize() Signed-off-by: Peter Seiderer --- utils/qv4l2/capture-win.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/qv4l2/capture-win.cpp b/utils/qv4l2/capture-win.cpp index 8add18f8..1e3986ad 100644 --- a/utils/qv4l2/capture-win.cpp +++ b/utils/qv4l2/capture-win.cpp @@ -27,7 +27,9 @@ #include #include #include +#if QT_VERSION < 0x050a00 #include +#endif #include #include From patchwork Sat Apr 15 20:10:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E7BDC77B77 for ; Sat, 15 Apr 2023 20:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229990AbjDOULD (ORCPT ); Sat, 15 Apr 2023 16:11:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A9E735B1 for ; Sat, 15 Apr 2023 13:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589458; i=ps.report@gmx.net; bh=xfWh7xyVzKjbQqW50oMRPpJ4oOpr7pqIFDjOqTaUwko=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=ipMXMuzXvUsxECMvzacq2gKsH6Y9CYKnbCu4zm5gQAOhxmpUlek+HWcI6KJpLOIcd K5rPBBf/Fpw/idanAKlhl0GIQzgzs5YcEZJ04124w/v+bZUF4fmOg5xjbAYnNqxbOX bl4tUAQtHOy0vobzIjumHsNHX6Zq3YFNtrPlXThXbI+XM2HFzMQEj7Bl1tEv84kpAZ UODdAW500Un1r2ih41afuZxTfPM1kq++D85GFtICyWGKnH5wphuEttR3WvbYSu73wd SEjzx9XpcEzd4/TNB1+FP6ts8Dku483hPXPr9q8h0IB3d1WlDM7+ydLflpY0ZkLuWA Ccl+HUQMCLMIA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MMofc-1q6XXa08TU-00ImFH for ; Sat, 15 Apr 2023 22:10:58 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 05/11] qv4l2: fix Qt6 compile (QHBoxLayout/QVBoxLayout has no member setMargin) Date: Sat, 15 Apr 2023 22:10:50 +0200 Message-Id: <20230415201056.31080-5-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:KQq7HsJ8BRRlbQsGUVTtxYAh0bX3Mo+t/YhtLZjrH4+0DbHKaxQ 91VfmDfEF8FPmVwc+dwixta9mDJEF5GH5+iJZTt+e6OLqbh4IG/wQ/noQYYEOcw11/H8fjd UsF0l6a96QZMxJw8awKxLivhBhK50PFPyqzGTdOtEm+kY1yQF1eTIFveSGuUSsk3/r7Lixz LpczEi5tdNn/gFCyvOz3w== UI-OutboundReport: notjunk:1;M01:P0:HBgBjr4dIlo=;VKHcOOrZqtC08YYlGfGFkpqOYd9 TlnrcQSkg0ImIpLlPIctOYr7g2fKpTx2hQfiqaBt5Ct5DOXezhN0rgGE2Bh6mefH1vAmv6YYV t3+CvLUtP3VeG2aEzHo0uqp+/p+z/L0q8DDN58IjTbJiI2yAqvTSrT/iB1sO9ySQUPKH9502g peKtJgUR6sL5rbHuN8qAzlak9Nav1+qSOXhBMgO2h2pDyYbTNlJRIBA63+OHHbAoLhc4InYYE SgGhRhBGPxFZkdLTkzvnUPSWFUB7dvFnPUppaYQ0JM/S9ThteTMrNiXVOE9VDb34mP5IuQ3Gr Hwzt5bYWlUSdODiXaRydbnPtlV9cp4dn+TuysK7BuMTKUX8Pp0LvHjANO//q4w/1+hegc/pHR MSzkta8kFu2MeXw0Csr/mGb3/8UFYEHCeOok2osCnRlL4So4XppalwBQnwRGcLMUwP0pCPGi+ IlPEGA1qQTxWo5SjRxfeaCQ2o91tLP91sNFMBHwqtz8UWwRgpXjDcInyjsPN7nMjrnmWczj1n 5wjljOYlsTfYSMXMRboXwUyQa812RwEDbKjaz5qf+v9J8v2pDjPuCjZU2th1ZR5JnfZApRY+K f2u8ef5d83dzrgBDhFFxEXcIcnZe9gj9HYu9mD2jHz5i1Or/FghaWB5CsY7tsVmbxJ1/CUOyf jDlUQ5+JSXDCMR7v/qwvix+A+jb95ogJf+GOqn8NC8VsFLvjmYOdwdrJ4IxobyXdXXXWqwY27 lkJ7HX/WdNjN+P3yrkxzmJKmH/BVJI49X+IWKfhqKWxCykw3MyrpiI1h66H7dFBZl8DgHjPsX ZO7Sv7ZaPMVDE4tNgscIwdE3eIWV6x/KjHBCJe2+x6fI4uYR20BHYeScGVBghZSJDY5bBfUyl ldfeQRr2DuqLxQehjN+pkca918WDYZGmxYjLr9VtA57XZUE30DomlKe7n/ryXkqxlABzWCSDd yDlzDA== Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes: ../qv4l2/general-tab.cpp:434:22: error: ‘class QHBoxLayout’ has no member named ‘setMargin’ 434 | box->setMargin(0); | ^~~~~~~~~ ../qv4l2/capture-win.cpp:130:23: error: ‘class QVBoxLayout’ has no member named ‘setMargin’ 130 | m_vboxLayout->setMargin(0); | ^~~~~~~~~ ../qv4l2/ctrl-tab.cpp:255:22: error: ‘class QHBoxLayout’ has no member named ‘setMargin’ 255 | m_boxLayout->setMargin(0); | ^~~~~~~~~ Signed-off-by: Peter Seiderer --- utils/qv4l2/capture-win.cpp | 4 ++++ utils/qv4l2/ctrl-tab.cpp | 4 ++++ utils/qv4l2/general-tab.cpp | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/utils/qv4l2/capture-win.cpp b/utils/qv4l2/capture-win.cpp index 1e3986ad..ef33a91b 100644 --- a/utils/qv4l2/capture-win.cpp +++ b/utils/qv4l2/capture-win.cpp @@ -127,7 +127,11 @@ void CaptureWin::buildWindow(QWidget *videoSurface) int l, t, r, b; m_vboxLayout = new QVBoxLayout(this); m_vboxLayout->getContentsMargins(&l, &t, &r, &b); +#if QT_VERSION < 0x060000 m_vboxLayout->setMargin(0); +#else + m_vboxLayout->setContentsMargins(0, 0, 0, 0); +#endif m_vboxLayout->addWidget(videoSurface, 1000, Qt::AlignCenter); setContextMenuPolicy(Qt::CustomContextMenu); diff --git a/utils/qv4l2/ctrl-tab.cpp b/utils/qv4l2/ctrl-tab.cpp index 67f55546..cfdecdeb 100644 --- a/utils/qv4l2/ctrl-tab.cpp +++ b/utils/qv4l2/ctrl-tab.cpp @@ -252,7 +252,11 @@ void ApplicationWindow::addCtrl(QGridLayout *grid, const v4l2_query_ext_ctrl &qe struct v4l2_querymenu qmenu; QWidget *wContainer = new QWidget(); QHBoxLayout *m_boxLayout = new QHBoxLayout(wContainer); +#if QT_VERSION < 0x060000 m_boxLayout->setMargin(0); +#else + m_boxLayout->setContentsMargins(0, 0, 0, 0); +#endif __u64 dif; switch (qec.type) { diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp index b83ccb67..105c5cde 100644 --- a/utils/qv4l2/general-tab.cpp +++ b/utils/qv4l2/general-tab.cpp @@ -430,8 +430,11 @@ void GeneralTab::inputSection(v4l2_input vin) QLabel *l = new QLabel("Refresh Tuner Status", parentWidget()); QWidget *w = new QWidget(parentWidget()); QHBoxLayout *box = new QHBoxLayout(w); - +#if QT_VERSION < 0x060000 box->setMargin(0); +#else + box->setContentsMargins(0, 0, 0, 0); +#endif m_detectSubchans = new QToolButton(w); m_detectSubchans->setIcon(QIcon(":/enterbutt.png")); m_subchannels = new QLabel("", w); From patchwork Sat Apr 15 20:10:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E44A0C77B78 for ; Sat, 15 Apr 2023 20:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229995AbjDOULE (ORCPT ); Sat, 15 Apr 2023 16:11:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229853AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16D3C3AAE for ; Sat, 15 Apr 2023 13:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589458; i=ps.report@gmx.net; bh=cxjIsTRxd7rpfE2B6wNkw+zVQyLmAhhqgcITcoNqFO8=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=Vh2k/2bOjMxwP/IDxkKTCVymZqxvjBMjbLYtBN7hPX/5N6nn+m44dpvH9XbB7M3pU LouGgHY5R5OOd7Qfxh8UE1CQJ+eNQn5WRXQApQyAXH7Fta2Tr4CK3/yPi97t7Misqi lFBY3B7x/lU/kOtb1f2cZFF3+Qe+A9C/jjJnsXYpzDSbgUtrsId/MTPrfYIncZpEyf U7RPo+24wkyn4c3nx54I1DU2myEFONOnQVNVKjB2Zj4vM5vhpDhq51iBhErl7nfDyy BlEWUWn+ZHjeuUYPflwaWLx6DYs7i7bIwYNKKuFTrirtPW0wqpEQx6x+yVDPmjqlzr XI4HvKInykabw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1McpNy-1qMZ1M0qyg-00ZttF for ; Sat, 15 Apr 2023 22:10:58 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 06/11] qv4l2: fix Qt6 compile (ambiguous overload for operator!=) Date: Sat, 15 Apr 2023 22:10:51 +0200 Message-Id: <20230415201056.31080-6-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:IyHhUS4+u6vjnJYSbRd2iw+cZuZ4BzNfBGEbPMLGrInD8DQvH8v ajH6IggOmrnrFeQaDiRbTy8XDXcHrDhuU0xFiQtfH9jmO+pOFwET7ys4rnOwFO0Z7Az82i7 lMtO8R6eFOxf9odtaTXt2KMsSyMjX4CbLlxbkNZ4oLPcSvCW+luGKf34MTU0Fl9n0GTF/eo KAkIG4ZfEx3TFMuA5XYiw== UI-OutboundReport: notjunk:1;M01:P0:mzCf3ixH5Ko=;YcfHx7uEb401NKLtCg6dqcoz5O6 vSMxazU7b7hcfmwCHQ9Zl3YbIkvdNrtRa+ue+MWQpUFkjek5D4Lnzj/sCqykoXP7wxuay/Vh+ Em3No49qtxvs24lvfkhDr8vfmwuOFaYzHpHhVETwiYsSGLxKYZqIZr1trsCkAyy1d/R3el1e/ 846BWHFqeZeHyFTgJcTmHb7vmG9TbL1jHOvifUrWtN9lRoxWOlVpJF7kM424RGm+No8xyjLHz KcgC8Tprn75F/d9mQyUYG18Ey2I2jSQwpZi/gyF/Nl46+uuPc5tCxPCseNSjHqd8aGMRA7odM Bk4aG/6nHXrBF9BcAOUyE13J9YIfQmZwmLn1Ss6uZSLb5CUe5USRVzeGeByy/scWQoFWY3509 38YXEmIxJxMzTBkWQfcPjdEUAlRjthz8lPNHLPlHCxVlqn0KHgfIiRalezlVJYupDXSBU/Hjh E6+ruP7uTljimIUwS6QKoKhTJEiLEvOKDyebLMlZz1vnjFX3BgZYbylPn7sy6OR5nltMdx7GY wxrUoh3YMwkZTQ6EQoAc9TLVZFJ1o/z9vmhRhGqzfTFLmiCuaVm+n6KkCN6Ieyy2X5Pf8Jqwz xTSMwKsAZftmI3BjHLau782xhmr8CL/kevDWqHnYqb1RDMw1MjjBOke7aIPR/KWJEi+jWsRIT l/XRxXplegnGaUbSEMgvc02tU3RhQ9TWTBRVtKt3+1qD0vqxY4OuxScq7zjhNqpKl7ZqZ3cTv SyuyjuiSAmfi1DbQO7cDR0/TnSOe3M1o94kCr7LwCVQ7QunTiQsJKl1+cZ0HovIngS0toHpmC ZXGg+rZbu0jcaBvp6R6ruKA14J/62jYW4kIcwuoDAmYKGzdMeK23Sx3bE2RJnWPvdgOFVQRPx 9oVUvdr/3zxho8Buhkdp7Fp/htVBGWs/VAslbJAdpZnpGWLd6CtirgCiocOlktZAuvwy5b3z/ qtZgXBQoYUBIajfFTCdsat2rez0= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes: ../qv4l2/general-tab.cpp:1113:57: error: ambiguous overload for ‘operator!=’ (operand types are ‘QString’ and ‘long int’) 1113 | m_audioOutDevice->setEnabled(getAudioInDevice() != NULL ? getAudioInDevice().compare("None") : false); | ^ ../qv4l2/qv4l2.cpp:1261:19: error: ambiguous overload for ‘operator!=’ (operand types are ‘QString’ and ‘long int’) 1261 | if (audIn != NULL && audOut != NULL && audIn.compare("None") && audIn.compare(audOut) != 0) { | ^ ../qv4l2/qv4l2.cpp:1912:26: error: ambiguous overload for ‘operator!=’ (operand types are ‘QString’ and ‘long int’) 1912 | if (video_device != NULL) | ^ ../qv4l2/qv4l2.cpp:1914:29: error: ambiguous overload for ‘operator!=’ (operand types are ‘QString’ and ‘long int’) 1914 | else if (vbi_device != NULL) | ^ ../qv4l2/qv4l2.cpp:1916:31: error: ambiguous overload for ‘operator!=’ (operand types are ‘QString’ and ‘long int’) 1916 | else if (radio_device != NULL) | ^ ../qv4l2/qv4l2.cpp:1918:29: error: ambiguous overload for ‘operator!=’ (operand types are ‘QString’ and ‘long int’) 1918 | else if (sdr_device != NULL) | ^ Signed-off-by: Peter Seiderer --- utils/qv4l2/general-tab.cpp | 2 +- utils/qv4l2/qv4l2.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp index 105c5cde..8bb03b59 100644 --- a/utils/qv4l2/general-tab.cpp +++ b/utils/qv4l2/general-tab.cpp @@ -1110,7 +1110,7 @@ bool GeneralTab::createAudioDeviceList() void GeneralTab::changeAudioDevice() { - m_audioOutDevice->setEnabled(getAudioInDevice() != NULL ? getAudioInDevice().compare("None") : false); + m_audioOutDevice->setEnabled(getAudioInDevice() != nullptr ? getAudioInDevice().compare("None") : false); emit audioDeviceChanged(); } diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index ea1ac201..e24bef13 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -1258,7 +1258,7 @@ void ApplicationWindow::startAudio() QString audIn = m_genTab->getAudioInDevice(); QString audOut = m_genTab->getAudioOutDevice(); - if (audIn != NULL && audOut != NULL && audIn.compare("None") && audIn.compare(audOut) != 0) { + if (audIn != nullptr && audOut != nullptr && audIn.compare("None") && audIn.compare(audOut) != 0) { alsa_thread_startup(audOut.toLatin1().data(), audIn.toLatin1().data(), m_genTab->getAudioDeviceBufferSize(), NULL, 0); @@ -1909,13 +1909,13 @@ int main(int argc, char **argv) } } - if (video_device != NULL) + if (video_device != nullptr) device = getDeviceName("/dev/video", video_device); - else if (vbi_device != NULL) + else if (vbi_device != nullptr) device = getDeviceName("/dev/vbi", vbi_device); - else if (radio_device != NULL) + else if (radio_device != nullptr) device = getDeviceName("/dev/radio", radio_device); - else if (sdr_device != NULL) + else if (sdr_device != nullptr) device = getDeviceName("/dev/swradio", sdr_device); else device = "/dev/video0"; From patchwork Sat Apr 15 20:10:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212640 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D206EC77B79 for ; Sat, 15 Apr 2023 20:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229997AbjDOULF (ORCPT ); Sat, 15 Apr 2023 16:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 404B73AB3 for ; Sat, 15 Apr 2023 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589458; i=ps.report@gmx.net; bh=SFZYmKbGLVMUoMrWr/dJQquMRT787THV/BxLgXqWKb4=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=ObeUuZL9Kv2NN5c+Hu8nz6vAScCxhfmRIJpo9BiCEY+6Qj65bqNL4Fuh8Yfj3+VQB vEPv8SZSgED/DwaXRE7aG8KARORTMq15FBq4Vv0CUcXtPKcJ3c16rv+Lg1TEr3sFST WZEftDqeANj0AaPv8pGu9Ets+yF5zC3L0J8ttGcpMUbSTSAWY39nPhFB6HBdW+LdW+ uyei6DgLmkRlYdpqfTxLM2+9OacDbjadLz6BRTQ0e9vfPisamroBNd5jQDhJBLTK2R ln8hItE0PEP9ZJcJRYmiX5dsJegfScESut2+3YKvpQ47hGFs4Xyn3WEEYnADMnPpUx jXmcOt8kSNAxw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MgvrB-1qHMMB1cKr-00hKHa for ; Sat, 15 Apr 2023 22:10:58 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 07/11] qv4l2: fix Qt6 compile (missing QActionGroup header) Date: Sat, 15 Apr 2023 22:10:52 +0200 Message-Id: <20230415201056.31080-7-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:u81Ln9xwdW0Sp/+zP6oobrVQxRe7Ejxglp+Yh351oMPM3fwPniN /sBQJp2d4i7iM8qXoEBYopGA4KRX3qL7QyflMbUJLsuHKJglvc3wpW3RJMtG6zm48iFse/Y WNEAkKx8KGIoJIc9ROa7KcsT2+WGtxWZ9y+sY5B0Z3fuEfJaWs2dRaPSIgaVqg/I2qreHej ZwMbTuW2Th2tf5yBZCYiQ== UI-OutboundReport: notjunk:1;M01:P0:1T/5QJ9kN/E=;Nxey3sFrjN3hiTAEjp3huiAcHMP FcCw7dor1wbH+VDcvrtBtAuIT6Oq+OeMZVoabtaqsgiTcCL8RZ1ofrYeFbIwW5oEdh8k3mNGv BgK9PZgKFpJ+OlxL3eVf7iWE1yFVwVMJibH/5H6M4vlcClQPztCj5mNmQDdJ9eykL+e6Gdyww PPYyFxIPMh5mCb44E6wcB47VMrenPTxd8C4mZCNFIXZs89q5yPu8YXYRBsuL/iyq0ThZNW7YF SaHgko7S/ESNovXsoOfFKGYsy7Y6fHTSMGQn1oOd/wnwV8p+Di+AlnsIbDwJFNXH8zHlRwXxp wpDkPOAaDPxUzfXxWh0VWfoPlkXu/rMfu/E49f/q5kI69nRRlTxgs9RLGsSOJcT8UTN208rTD nLN4YHVbsa0tatTetDay7UEq4KJalq3uZD+9iyFUrcBsZvIeeVV59v3+keF+mpizLMzCKgtnX UcTKvpKftLsozH6biu1DKqOCAd5SJEvlpoHg9cNNn8/wqM284rWAIVPfO0HLyhlXpscBrQ2vw HjH2JYGAr5oFXdVgmG9enHsghgqD4ebDQ2D7tprxyhC2Zg4YmEFCeFelQWcVP2Oon3+Eaejk5 kSgmi1qkstJ+eK8il/bv0ZZuUZ4AeFpwffak5TjsMHd2hRftJUuSSCpu+F6tRN78zo4gUOExY sYTARsTAMhUj5Jhias4JNGw9bMCoOrC0X/GZWgSuRhwf7BvWEJEd6Hb+utNou6q/Tlw/EmQ7R v0NcWRRbNpw2TQxFpKuXwpTOPxwSn/fsft3QHcLpEnv04hLu+WHlPl5goENQdN57GxLFlRShB uRFfHtvMinmbBDZbIiC3wTASZ/VM+iifxhiAzVeERFKkBOCUfR+P2dkFY67Y+fIVTnAsM1Q/i Af9s5IFbPwz3USFgrov/ME6JcO9XAntZFGfYlyRtjdFG44XzuDmK8czjmSSgX+cCwwPUTOQKI uo7YcA== Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes: ../qv4l2/qv4l2.cpp:246:36: error: invalid use of incomplete type ‘class QActionGroup’ 246 | grp = new QActionGroup(menu); | ^ Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index e24bef13..e49a4599 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include From patchwork Sat Apr 15 20:10:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9CE7C77B7C for ; Sat, 15 Apr 2023 20:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbjDOULG (ORCPT ); Sat, 15 Apr 2023 16:11:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbjDOULC (ORCPT ); Sat, 15 Apr 2023 16:11:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66F8A3C23 for ; Sat, 15 Apr 2023 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589458; i=ps.report@gmx.net; bh=zuaDm8afGiipjzOzECS/20cWSOAOdeqwh4DTVU2C9Qk=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=CKA6VLJMFE60cOkh3Mn5Y5SzwWkTyiWaejDDeUWuihN+dTDcF981XArdDm5tZKuMA nur5GAuVCmDqrxPucycC62O+QXTLFNeARknw58ha+jliKzjn7KAl1x5zoOroAGED5T 2lBrVyQY8+6UBrk3hZNf31KeKvyFQbndvCsvWzfD9njLjKDd0YucH6yWwhPk8mu7PA V+phDt3uBJvETyqP8xu8EyP8pe/LikZunrhz4dVv/0T2s8mAUR24pIdVthBFFdP1Yl 7Qs19N6tICQxiMxrDHGvx3VYPkjqavC4NZBjSsJc7SEOZCr0L4t2T94GsCLN4LV04y hkHHwqa7ENrmQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Ma24y-1ptOOU2YGS-00W1ml for ; Sat, 15 Apr 2023 22:10:58 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 08/11] qv4l2: fix Qt6 compile (no matching function for call to QString::split(QRegExp)) Date: Sat, 15 Apr 2023 22:10:53 +0200 Message-Id: <20230415201056.31080-8-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:PsiOptHDH9H2TOmmfW0/8AHgAmDHvXf+rlVC3W+HEt83SzlWnPB dPgO1JYkfYszG42PFx1Vkt2/p0aWGiAldFaAQ+SPy9QZ0+MzXStFtA5ntRTDoOzsGd6kR+u TfPbDLfKHMwbdfQ2kLh/8gGgb5OYKJTvFZeRgEO2oNuyn8Moo+ywWUOf0g6imCVYGU4puBN rINlmqYSMZ/osj5LxrGGQ== UI-OutboundReport: notjunk:1;M01:P0:nTsORjf+2Jc=;Jk/uadfl72wifysaTgivodq2cxw xi3+32SrxNSS/gb6vsj2Tv9c64a61b6bMMtWjqVpptVX9LRfXLNPGCnK69ZfIBAWcH5vrZobn WYxJ58Jx8eHvbkpJrXluz6RKatbBszFqlpu39u6M57D+2UDq5yNbteetWA6ZZquw7cvW/JyrZ QuxMhk5uxMNY9d1Cd417lKoO2uJpSNAS1MM4fVdk8jH6olosJ8dQ324VtdyZzfbCrOztihK6p blLliA98i+SoH3G4PHTG6Nnjoe4/gsDD1v72gWxTV+UeTsJ9GeGmMY9AKkVTeVgelkZUPPeLi Hq+InmBMKGyrJO+An6AA9ZYk8n+MIOEiq0oFeD4ON6noGJ0djDvsqY8ucIXqo2YuqW5A7TeAw itZNBJyrtWNQDby6vhjVl3As9k43zn4Bf26lTmaOcfp2LkTkUthWd8/1TD89tMnHH2268eaEk t9dSYxGalycQhWtoK1BWJIcDBqI9IdOdHJId58d6IeEicHf2wBhUlYtxG9VnnD76mw5i0nw3V AQSYfjfdpikHBOQLksQVf078Qlx+HoCzY064vpmJLKgg5QdOCWZvAQ3NAZuKN3eDkyxn13Ysg Gh+Jojxc0LszAIHxUmbuU+vtzf7OH/vb4dFiCcKL7ERUGpQ6tk+D8diQnIz5WnWuYEcBA1KFt tUCsND7OOQhKN2LuJBWDhc4FLVHr27tBk99OIVpbDESlEXcljKJ4vodn0iEbeC7mNDkcYwqQh itnhYg68qp3MdXiqrxUHVrJEtQEHqXRNc1dVnUaYEjT0aGnIuuECIh4fI3sSUgCrw37o6JlvS rueizU7aoaDckQATcoqvGGqZhB20iH+lRLwsE+BPtSzPjF57asL1ovYnwOM1EZ537ZGlg3MAX RTaufjhKJqsdBo9a+zHiX56I2MYgnwiB2r2KfYo8JQbKwv49KJ9sSLkhDXsUymME4hjVbHy02 urOSO1FaJERdakwU7PRkkaOTo2s= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes: ../qv4l2/general-tab.cpp:2396:69: error: no matching function for call to ‘QString::split(QRegExp)’ 2396 | QStringList devAddr = QString(devname).split(QRegExp("[:,]")); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer --- utils/qv4l2/general-tab.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp index 8bb03b59..ffa44eca 100644 --- a/utils/qv4l2/general-tab.cpp +++ b/utils/qv4l2/general-tab.cpp @@ -2393,8 +2393,14 @@ int GeneralTab::checkMatchAudioDevice(void *md, const char *vid, enum device_typ while ((devname = get_associated_device(md, devname, type, vid, dtype)) != NULL) { if (type == MEDIA_SND_CAP) { +#if QT_VERSION < 0x060000 QStringList devAddr = QString(devname).split(QRegExp("[:,]")); return devAddr.value(1).toInt(); +#else + QRegExp rx("[:,]"); + rx.indexIn(devname); + return rx.cap(1).toInt(); +#endif } } return -1; From patchwork Sat Apr 15 20:10:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212645 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59081C77B73 for ; Sat, 15 Apr 2023 20:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229958AbjDOULI (ORCPT ); Sat, 15 Apr 2023 16:11:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229983AbjDOULC (ORCPT ); Sat, 15 Apr 2023 16:11:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C9523C25 for ; Sat, 15 Apr 2023 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589459; i=ps.report@gmx.net; bh=gV1CjmB/97FXVjZ9FCZRGpD++tNse9ciaAzi7LGg6KU=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=JuYZv8ScjF+/7IILQtsj2L6dEz4RqQ8MqgGNAf1aAEbWT7W9PG/RjsPoBIRJnc2OW 73NKCk0LsL6xRg+bAPKtiefV3jaSc5nyVUUpxOwtyADOPq8JOK2aKrTmKEfrpne7ZP 67Rn9oD9+lGhykLOTBiQZNfmbj7bdLx/fFy1SxTYFN34F5h7nAURIVaUOYuJSon66q TZ7xNadxCXVVCqNznuOReIYl0sn2qR6usAYNU47yU3RnNKOqP26KKWMlJGRJUFttII s5YG9daGOw5I/KZVG4o54euQcVyhsvcr412Hed6YSdyJYCSOlkP7yLdcm63E5CdjPN w1axHtg+jxueQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MfHAB-1qFiSf3J9v-00gmaK for ; Sat, 15 Apr 2023 22:10:58 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 09/11] qv4l2: fix Qt6 warnings (QKeyCombination operator+ is deprecated) Date: Sat, 15 Apr 2023 22:10:54 +0200 Message-Id: <20230415201056.31080-9-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:cLkDtHTVEEZjPy6ZevN9dCbaVTLgwWA3eo1wR5PM68hhXgibuAG ksu9nr9yRtBg2WHJneLsxoSTdmqvwB0MZJfANNPmxIIP3sbl8sLIFbMEa8+Cb5ycXSaIPEp DKL7BTuDL02LzIwRbMwNOPV3HhIkxtNJXM07unxPIeNqYrNvn6Z5n6h6im7SSk0KcMTtki0 WvWQmbgpyxo/W3feEHDag== UI-OutboundReport: notjunk:1;M01:P0:T4N7DAPt/2Q=;PIqhQ+j2GPAGEpWYdtMEF9cMdtW ifPjc9iyk395+3Jap3WIVLox1eZ5rDrVmMqVNBiiCxxhhb0e8jCxLTDXRI3J6V6/GOillRtSR 0rYo5CsuD1JPyGij2YwqZtCp+5BDyH6wWZnI5BhUyoKz1NSpEIZOpIgEwv12QweMI0x+ZUb9q aJnqLaflxYmk8fUXO3BSMFN6G+NXjQQ1ftdNvEG/AUxmTnCzCo84B03fZiTgaK1hkgNN4b06V T9IG3r230v8iH4BNvGVCVWqTUK7LblLWPW7hRVorfeA8aWTxZxMcwOupXTJQk/tkZguCrVNA6 /Tlhtz2GzF+ZFZmLoPf2XPcqvhHEVRKyIxXCdjNmY7wvuI/FkN2DwKKcC26EP7+25/TboA/qV aT8T2FtraHdgFYFwHLKAmKaw9/ONqMXP+RDR6IuceeBUAudYXSZw0vFhs4dAWXRqwdVo03HDw 7uMQYT6tEJ79MxGxY7yOcdt79qhXojTTWGfvwQr98X6DqiCiDgTyFjJa/kUE4DogTP+JpIt/2 olEABxbZvqk35OK/q3RhRxR14HhUdfkKgAVGEFR6dghPehHCucDembXglsh8Ixjduj4pKLcX0 sIRjpYwcye5aOXQWXMMtKcV4KJLXRPlOygrrheKp+DoSbUwB/85RsMAz4FlsVnnz6DzdqgLNL WKD1hMlnIRkLhYeuzVU6JF+y8BiN8ArGKkF8IdtIUeHBSqZpLyYU3BbFE83qVb/H38U5Hkjn0 OX0o2DioQSXZbHtDLd8asjmKFtd8VSR5vMqdIJMj9Ah7UqDvBZuCv2kx1nEthO9NHL+gJmN/6 ziy97QP7biMrLOIXNAsJAs8CxytUjRQZNm9p4g2ap5KE7rGUPmijbSaEz7Lg5Xe0bzWFSm/Z1 4jnkt1SHzyoB04+h8TbAfPKLWPdg61We/ot70MwPxCV8TmvLt5C3SUjB9ldrgw/EQroXggUgR 8eY0CAjpOsA1s9xwKMHJcvRV+kI= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes: ../qv4l2/capture-win.cpp:49:57: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 49 | m_hotkeyScaleReset = new QShortcut(Qt::CTRL+Qt::Key_F, this); | ^~~~~ ../qv4l2/capture-win.cpp:69:35: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 69 | shortcuts << Qt::CTRL+Qt::Key_W; | ^~~~~ ../qv4l2/qv4l2.cpp:135:43: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 135 | openAct->setShortcut(Qt::CTRL+Qt::Key_O); | ^~~~~ ../qv4l2/qv4l2.cpp:140:46: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 140 | openRawAct->setShortcut(Qt::CTRL+Qt::Key_R); | ^~~~~ ../qv4l2/qv4l2.cpp:147:49: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 147 | m_capStartAct->setShortcut(Qt::CTRL+Qt::Key_V); | ^~~~~ ../qv4l2/qv4l2.cpp:172:44: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 172 | closeAct->setShortcut(Qt::CTRL+Qt::Key_W); | ^~~~~ ../qv4l2/qv4l2.cpp:182:43: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 182 | quitAct->setShortcut(Qt::CTRL+Qt::Key_Q); | ^~~~~ ../qv4l2/qv4l2.cpp:212:53: warning: ‘constexpr QKeyCombination operator+(Qt::Modifier, Qt::Key)’ is deprecated: Use operator| instead [-Wdeprecated-declarations] 212 | m_resetScalingAct->setShortcut(Qt::CTRL+Qt::Key_F); | ^~~~~ Signed-off-by: Peter Seiderer --- utils/qv4l2/capture-win.cpp | 4 ++-- utils/qv4l2/qv4l2.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/qv4l2/capture-win.cpp b/utils/qv4l2/capture-win.cpp index ef33a91b..c184381f 100644 --- a/utils/qv4l2/capture-win.cpp +++ b/utils/qv4l2/capture-win.cpp @@ -46,7 +46,7 @@ CaptureWin::CaptureWin(ApplicationWindow *aw) : m_appWin(aw) { setWindowTitle("V4L2 Capture"); - m_hotkeyScaleReset = new QShortcut(Qt::CTRL+Qt::Key_F, this); + m_hotkeyScaleReset = new QShortcut(Qt::CTRL|Qt::Key_F, this); connect(m_hotkeyScaleReset, SIGNAL(activated()), this, SLOT(resetSize())); connect(aw->m_resetScalingAct, SIGNAL(triggered()), this, SLOT(resetSize())); m_hotkeyExitFullscreen = new QShortcut(Qt::Key_Escape, this); @@ -66,7 +66,7 @@ CaptureWin::CaptureWin(ApplicationWindow *aw) : m_closeWindowAct->setStatusTip("Close"); QList shortcuts; // More standard close window shortcut - shortcuts << Qt::CTRL+Qt::Key_W; + shortcuts << (Qt::CTRL|Qt::Key_W); // Historic qv4l2 shortcut shortcuts << Qt::Key_Q; m_closeWindowAct->setShortcuts(shortcuts); diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index e49a4599..bcba88f5 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -132,19 +132,19 @@ ApplicationWindow::ApplicationWindow() : QAction *openAct = new QAction(QIcon(":/fileopen.png"), "&Open Device", this); openAct->setStatusTip("Open a v4l device, use libv4l2 wrapper if possible"); - openAct->setShortcut(Qt::CTRL+Qt::Key_O); + openAct->setShortcut(Qt::CTRL|Qt::Key_O); connect(openAct, SIGNAL(triggered()), this, SLOT(opendev())); QAction *openRawAct = new QAction(QIcon(":/fileopen.png"), "Open &Raw Device", this); openRawAct->setStatusTip("Open a v4l device without using the libv4l2 wrapper"); - openRawAct->setShortcut(Qt::CTRL+Qt::Key_R); + openRawAct->setShortcut(Qt::CTRL|Qt::Key_R); connect(openRawAct, SIGNAL(triggered()), this, SLOT(openrawdev())); m_capStartAct = new QAction(QIcon(":/start.png"), "Start &Capturing", this); m_capStartAct->setStatusTip("Start capturing"); m_capStartAct->setCheckable(true); m_capStartAct->setDisabled(true); - m_capStartAct->setShortcut(Qt::CTRL+Qt::Key_V); + m_capStartAct->setShortcut(Qt::CTRL|Qt::Key_V); connect(m_capStartAct, SIGNAL(toggled(bool)), this, SLOT(capStart(bool))); m_capStepAct = new QAction(QIcon(":/step.png"), "Single Step", this); @@ -169,7 +169,7 @@ ApplicationWindow::ApplicationWindow() : QAction *closeAct = new QAction(QIcon(":/fileclose.png"), "&Close Device", this); closeAct->setStatusTip("Close"); - closeAct->setShortcut(Qt::CTRL+Qt::Key_W); + closeAct->setShortcut(Qt::CTRL|Qt::Key_W); connect(closeAct, SIGNAL(triggered()), this, SLOT(closeDevice())); QAction *traceAct = new QAction("&Trace IOCTLs", this); @@ -179,7 +179,7 @@ ApplicationWindow::ApplicationWindow() : QAction *quitAct = new QAction(QIcon(":/exit.png"), "&Quit", this); quitAct->setStatusTip("Exit the application"); - quitAct->setShortcut(Qt::CTRL+Qt::Key_Q); + quitAct->setShortcut(Qt::CTRL|Qt::Key_Q); connect(quitAct, SIGNAL(triggered()), this, SLOT(close())); QMenu *fileMenu = menuBar()->addMenu("&File"); @@ -209,7 +209,7 @@ ApplicationWindow::ApplicationWindow() : m_resetScalingAct = new QAction("Resize to &Frame Size", this); m_resetScalingAct->setStatusTip("Resizes the capture window to match frame size"); - m_resetScalingAct->setShortcut(Qt::CTRL+Qt::Key_F); + m_resetScalingAct->setShortcut(Qt::CTRL|Qt::Key_F); m_overrideColorspace = -1; QMenu *menu = new QMenu("Override Colorspace"); From patchwork Sat Apr 15 20:10:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212646 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA3E6C77B78 for ; Sat, 15 Apr 2023 20:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbjDOULJ (ORCPT ); Sat, 15 Apr 2023 16:11:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbjDOULC (ORCPT ); Sat, 15 Apr 2023 16:11:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6B953C3B for ; Sat, 15 Apr 2023 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589459; i=ps.report@gmx.net; bh=bcIxcRzdhA/7wggTEsVG88G9vW/n7d2T+AnQ+d4pOCA=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=guygzjab0fVrAcpncZ89chl4r7iarhrUJSJ4tEj3IxHr9st5xgdbBB08lBdDCBhab oAEc6JNArMwqUP0uy+t4THpaS0VEQAnVXw8UsbSXC/+j2Gdqr/YEjLQn+owoWi/JYs 3kdhEgDx2pqNDE0PfFAK1h+r2y3g9BrbTRjZoj+RWkxDzeO3qMhr+S4rp5Q2RONyZi 1J+mqynto8UtQBtS5sHUBXFywSuYMZ58kWV+kY6uIgow1oCwAKM/RHcKfbsBlJ8Ns3 1Kxx97yMJebafj3D974af7J/D01m8QbteotTrzPyoFf76IxgfZVBkyvzsvLUDkx8hS utq4w3/YCMEKQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N9Mtg-1qSj9442Kq-015MXL for ; Sat, 15 Apr 2023 22:10:59 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 10/11] qv4l2: fix Qt6 warning (QMenu::addAction() is deprecated) Date: Sat, 15 Apr 2023 22:10:55 +0200 Message-Id: <20230415201056.31080-10-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:feJccnwbKU3/WWNwCHnYVfU0D16K1idzeSVAoOBCmrVGQtvt2P1 3YW326RbSkudjcjqf6b5oW0Cp23ow4sVkd63ktLrF85ZXQnDqVBUB52W8uYZ2mqLJ50gPsT N/7LXFJXIoN2yVeQOSCR26I/ATphyKRt45UZAMbFADE+t91IaGEHmYbJZKSDRF30qJEpH0n ye9s0vsO+GaJCBFicHwgQ== UI-OutboundReport: notjunk:1;M01:P0:J5Tx1kddJis=;tvLKJ6tv74P9EhsqQHnkCFPxtn8 fwVAkwumnxmu64fCJezGXn4mlGgMfAOarzkOMgxinzGVtixlVy0utQcNghyfSvOmcnoN6Qxkt JcSnUM6oh82qj5p/iBTziHJ/kuFFrZXkWID5WY9VKfEl/d2w4COV21ZyA/Me09NK3xXdQryn3 gzU5tDBa4Tr0So2suGNMbuM9JTWCaQllQkYJxKs2dGFnrLlJo5/N7r0H0BQyfnKRN7D+0Gkvs XIasU1Yra9pp9QJDOTk3CTSdL+p8tgiIGbubAul3shZyF3TU4/H6E2sVONiuem6sDTTAMpl39 DvYjmdxraXIBbp3i1y+4PtZeUSjPp4+RwQhyC3zypRk3dFlBGl224VYDMIOcvH3zDanHJj5We 8BgQriKyHbqhyZEqrX9t9bF7mbZRv0Q6dXVS1WqV7xUwnMXhAqhFyCWPb5FeoVBW2G0KcnZIM tXBL0MdxAWBXJwjtqLgKmbj7nrR8jW0sQjSgDpAQ3mq2t15tD6aoRrKxZa+EVCavNHLKkufJf Pm7F7izWQ6Llq9aoZbjKpvPPaBXHniknqhNoVdsOV8Y9FrYzLXTm5CV5cd8LRjNiNkwkyv29M xIx0uVY8+eAZdEckRCsYQ11ezM08jWyrEamQJhyxh3pyj/R2EPMxuX6a8JISzoleCZc8IaQ/9 08JcZ33Z12HM6u+WQiB+FaE4zH7RtKY+w2+VrHPOjLWIZ4RoILHJpXf4gBjjG0sQXlm1CeVgW WuOD5ef7xCUoPbfQPcKQ3D5NYs571KFj3oL/OdMsRIYj40dliqk42GBhAGbJM4rCk2fJtOlus 7EvXuXrQdkmOgDl8YG38mCNKx9e2vB7wo0vVETt/43N5UfTqcAUhi7wluO9rhaAwEIkv1bhUs 1r7lMyCacItLdqXOn9WaSp7xroucZVdRmXZxKD0XZ00CCHRq3p329BGEmbuvY45hds64+XdWN 2Ayno3lplnPgd6J9fzRKECmOXSw= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fixes: ../qv4l2/qv4l2.cpp:327:28: warning: ‘QAction* QMenu::addAction(const QString&, const QObject*, const char*, const QKeySequence&)’ is deprecated: Use addAction(text, shortcut, receiver, member) instead. [-Wdeprecated-declarations] 327 | helpMenu->addAction("&About", this, SLOT(about()), Qt::Key_F1); | ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index bcba88f5..d4a06171 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -324,7 +324,11 @@ ApplicationWindow::ApplicationWindow() : #endif QMenu *helpMenu = menuBar()->addMenu("&Help"); +#if QT_VERSION < 0x060000 helpMenu->addAction("&About", this, SLOT(about()), Qt::Key_F1); +#else + helpMenu->addAction("&About", Qt::Key_F1, this, SLOT(about())); +#endif QAction *whatAct = QWhatsThis::createAction(this); helpMenu->addAction(whatAct); From patchwork Sat Apr 15 20:10:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13212647 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE7B1C77B77 for ; Sat, 15 Apr 2023 20:11:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229983AbjDOULK (ORCPT ); Sat, 15 Apr 2023 16:11:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjDOULC (ORCPT ); Sat, 15 Apr 2023 16:11:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B657358C for ; Sat, 15 Apr 2023 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589459; i=ps.report@gmx.net; bh=SuqFgEJBS4/g+fquOfTJmRrju+9Qbv5Vu67JidAudAw=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=PgE2EZ4HdoB0qypAIB0iNeqGE7C0ON0OI7LtolnnY6pCq9c523BgjSAMVPTnq22pj ZXyOyAxu2yc7iYggjjeZYdWfmMN0kRgtbTkJIQUdUifbv/oz+pISYJrsOTpHcGEUgM 2Juih8UzEzNVDMnv3UCIMXHA2Uh3uy3Nz+0WFhA1MnYS1rY6SdBq3LuDsNhX4JgoBI pGgL8CV+mL+bV6EEw0lyQ2at7yj0tQPJm2YGhFHEvk4tem/AFPfR9HcQM6j5WkmxCF MJBv/pLd9augn7QVkkn8q5yDKRmfQfQ/YOWV82XQUxLKKfEDPsGGELUnX7hepinYd1 omlLO0/cEoDQA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N6bjy-1qPzK90apK-0186cz for ; Sat, 15 Apr 2023 22:10:59 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 11/11] qvidcap: fix qmake project file Date: Sat, 15 Apr 2023 22:10:56 +0200 Message-Id: <20230415201056.31080-11-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:dpohvC94XOYNsUQQSukolWJNxcBfbhhDclk1uq+FGCnVHEJMxqo Anci/bH+mz+qLtZUuFTUCyxuZXtUZnvdMxICwLAIJ5nbxsF1CV4B8ET10/b25IuiWGvgxhX aoaU4nMAELlkBhHjveIgOgSB04dInSCgsacW26V1aelO2nMntVHzkrOFC4ngvNQj9VX94Iq mjZXlwjiaw1C1lnNgIf2g== UI-OutboundReport: notjunk:1;M01:P0:yxe4hkjaGQw=;31MNsKcXzjVz2pRhk2HKqp9eau0 dhSkT8lBuJPs/P3npCrk8Gyl0o5DTR9kLkySP1zTRdkmu8eJql2iXF1u7TX9N3kr8Vnh8TZOK QmxiuLq8tIMi7Dox7mZWjbKZc1Jl9lsqgRMlagvXVcxS/H71U0lczdueDXRRx+ZW5Mk6uaHHk l3XQAyoJmzWrJylaAuhotSPnBVkNrY8nNmUOLHUdDU+n64fclU1WimoNBiEMQPMPkqYZVzOej WG8WAw/mdoBiGsReyJ1AlIk5wvUj0tqXSjys6Ua9XIGZ7cSIzbaVYWzifL10hsgsjH8NCSuaF N/UzQy068GwrfNB+Yg07Cpe7SVEXPE5lnDV6HUuLJAO3qz/YUmacA3SX0H8uuM8eWoAvxyTb7 KmsRVY3OlMTznS6NN8QjAAn5ceXRgwdAu0RsdbhaibYDooOwixbjMc2EpWnIob7yBVvNsI1/h LvA4rtoLF+o1gcxNACwVxaMcnx621SF3tHNrs9xH+IuAVe7GJE1XiuFoRnF7x+Ee4DCgN6oNy VE7adPnP79DZTFEqkeKk+ecveZ+7PuMKDqJ3RP+arRzte6RHSs7EqQ88WOaU6JoR+NdZOhJAU 7EDNZoj0OuVdZcYDsopjKe711w6eTZ5L7sF3MH+A4CEizvvRlPzZe5S/hGq8BqDLteOT0GoOp M3J4M8P+fp1Bxa9fOndMa3mnrIhC3CwGngNisUod++9Mj0Gr76UvB22/vjrqEdvPNfvKzfqq7 7CTvgI/K8KDXgSK+bE1xpA3niGd9hVIeT3LM3FVecAvdxRhq/2i63syRPq5cLLHcSbUn0n2Qq 9yJl6aZYFxhSR3Un0TynEgJNulUtRGcKftCJzan1GkzxzMq73zbRlUMWxmP0Us04tryhIdDe3 CUw8TTGRXNW6SciXcXTtp7J9k2lYlCfyeiN8G34oskD9Rsfu2ZM1wKeyHHntvnTFpYXBmL9Lw VsfDOw== Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org - add MESON_BUILD_PATH variable (and customize hint) - add '-include' for config.h file (as the meson build does) - add v4l2-convert.pl call to generate v4l2-convert.h - add missing common/codec-v4l2-fwht.c and common/v4l2-info.cpp dependency - adjust local library file paths Signed-off-by: Peter Seiderer --- utils/qvidcap/qvidcap.pro | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/utils/qvidcap/qvidcap.pro b/utils/qvidcap/qvidcap.pro index e9eaf7c2..db948611 100644 --- a/utils/qvidcap/qvidcap.pro +++ b/utils/qvidcap/qvidcap.pro @@ -8,29 +8,41 @@ CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +# adjust to your local meson build path +MESON_BUILD_PATH = $$PWD/build-meson + # opengl: to disable opengl suppport comment out the following # line and the line '#define HAVE_QTGL 1' from ../../config.h QT += opengl +QMAKE_CFLAGS += -include $$MESON_BUILD_PATH/config.h +QMAKE_CXXFLAGS += -include $$MESON_BUILD_PATH/config.h + INCLUDEPATH += $$PWD/../.. INCLUDEPATH += $$PWD/../common INCLUDEPATH += $$PWD/../v4l2-compliance +v4l2_convert_hook.depends = $$PWD/v4l2-convert.pl $$PWD/v4l2-convert.glsl +v4l2_convert_hook.commands = perl $$PWD/v4l2-convert.pl < $$PWD/v4l2-convert.glsl > v4l2-convert.h +QMAKE_EXTRA_TARGETS += v4l2_convert_hook + # Input HEADERS += capture.h HEADERS += qvidcap.h -HEADERS += ../../config.h +HEADERS += $$MESON_BUILD_PATH/config.h SOURCES += capture.cpp paint.cpp SOURCES += qvidcap.cpp SOURCES += ../common/v4l-stream.c SOURCES += ../common/codec-fwht.c +SOURCES += ../common/codec-v4l2-fwht.c +SOURCES += ../common/v4l2-info.cpp SOURCES += ../common/v4l2-tpg-core.c SOURCES += ../common/v4l2-tpg-colors.c -LIBS += -L$$PWD/../../lib/libv4l2/.libs -lv4l2 -LIBS += -L$$PWD/../../lib/libv4lconvert/.libs -lv4lconvert -LIBS += -L$$PWD/../libv4l2util/.libs -lv4l2util +LIBS += -L$$MESON_BUILD_PATH/lib/libv4l2 -lv4l2 +LIBS += -L$$MESON_BUILD_PATH/lib/libv4lconvert -lv4lconvert +LIBS += -L$$MESON_BUILD_PATH/utils/libv4l2util -lv4l2util LIBS += -lrt -ldl -ljpeg RESOURCES += qvidcap.qrc