From patchwork Thu Nov 16 12:23:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 97078 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from sv.mirrors.kernel.org ([139.178.88.99]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r3bPr-008lrR-SP for patchwork@linuxtv.org; Thu, 16 Nov 2023 12:24:16 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A4B60280FCD for ; Thu, 16 Nov 2023 12:24:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96B0B2FE04; Thu, 16 Nov 2023 12:24:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="Nh3queC0" X-Original-To: linux-media@vger.kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04286187 for ; Thu, 16 Nov 2023 04:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1700137443; x=1700742243; i=ps.report@gmx.net; bh=Qjf4AH7yZ9mpz2xU3sHRLeOts1AisIajChvtpTw+Yxw=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Nh3queC07R8a3On0/7FUH8J18mNugfYDSABaxM9NvmkhpgaQObPTqh8AeZ1YvE/z VB7AEZsQUW8yuXZpORx655xjF1Ci6fkg1n+XH9suZkmer/GvhVnHBqr9JoLrSaZ7l b5QGDbL7DipXhQ69ZD94DZVAzr5Y0x6XuZBW3J1cPHlecEZiUoIGafug/zCG9mVLi VFFRB2T1q0I7j+mcim7cGSJlkN0GIDRWK2ryxeYK2lAFuBTlzx7SyI2PilOL/oSSY QhTVr5RohML9Kt2tc/jwJIdy8DIfVz0D6yOzIraXTw/4MTnlAvqwVGNZJ6ZG90hwd UiI0kyXi53hvb0UsYw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.247]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MmDEg-1rllqt1DEG-00iAZY for ; Thu, 16 Nov 2023 13:24:03 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 1/4] qv4l2: remove unused local variables 'QString what' Date: Thu, 16 Nov 2023 13:23:59 +0100 Message-ID: <20231116122402.28730-1-ps.report@gmx.net> X-Mailer: git-send-email 2.42.1 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:PjDGd1vRn9K5vNIunBNSVKcLUd4t3mjUCossa85S4+HSsUZQX0z +bbxEMz1aVq1pcwnTSaSRdH/jzuqxdzN5555KT2RYlUff4aJwaH9qIFW+0gRYTvHJemqcyH iP2a7AGodGQiyQcUeh8VfcmGhslXJRjcJT3BxThlWn3FdBiFLpSZe8R2cwNxvowJhgVTnns TYxo+NMxdKanUyNp9XEng== UI-OutboundReport: notjunk:1;M01:P0:+w1IrL+1ZHc=;NDc6mqKAdrqSXVBdqkOMtfz3e9u d7GbqKyXFbTitxw5THQjRrbav8sEKmAtg+WPx8IyfThxo2pn+DdzMrZ8hOv58SDh7BnIKy63b XB5nzYHnzIe2LARCZA0COvfELnUDx1/Ai16vywSUNnXWMBHj6NM1+/16Vl607XyRKM6bz9hHW wO4v/me1CCWN3btE+kpaXHaAYW6V0KPAfC+kxSDRoLcK+B4aUNx7LKYCoOi0AtJ4t1IqdBsxR ooCrTaETJH2ZK7LYt4Nr5Qm0z5YxuMd+jd/ZmU0noACUR1rzfLuGrDnOkDpwSYzuuPXbrFjr3 kEzMhfn+FmBu4EfafUWhYHFwgzd9nearckBKWy5HopETILwdvXvGhF4m9jXFvUbJiRun5HGLv 4lnNXPUdy37RU2H2Em8O696f9xT8PxtTp/yeYGCl31D0Q3iWwjhkIZgXsBg5hS/CKBz4dAfAZ fQ2/I6j9CS2kjyCbzxr04XCs1iuwpyHFC2S0d8RNJRypdcDIOk2mRsz+fQNH0dV9O/3oTiu8z jP9aohJXWLd9SfNq6TP/GEEWIfYmQEAH+4qKTQPtl+xhtHBn6DGeUO35NAwRkocD8GBiGirl3 AdxXqvGq39NkS0AP2BdqZCcjik5eroZa2T8kHqFWoQ70H3m7Pffaj2c8XNkIOZm7q6j0Ozlyk /1D6xoi0kkQ351Mr8l9npERvID12u3uXKEURyS7CRfyAT598/xPbWRxe2Mguu4BhlAzw6dFrN Uq8WzYDt2bkaE9nzJr6gqXCPSDnEiRXUPqWTgffaL0cu2yrCPcbvj8vyELYF05KYgt3Vh3/Os zul7ndDLEz79NmjoRJNXuH0iyOpFfbMh9IdWCPx65etz1MY7OGfqEyBUqRcdVQr1T3jBoIMnL QZCtomMOBJH1rRaZZ8SHu/XOSEMIDXbdIvUH8x4QsvB9maud86v7IUXf+ehdWFcHges+EdF6B P/k/phppnrHWdvm5nO43RUgNQDc= X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,MIME_BASE64_TEXT=1.741,RCVD_IN_DNSWL_MED=-2.3 autolearn=unavailable autolearn_force=no Signed-off-by: Peter Seiderer --- utils/qv4l2/ctrl-tab.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/qv4l2/ctrl-tab.cpp b/utils/qv4l2/ctrl-tab.cpp index cfdecdeb..dcf014a8 100644 --- a/utils/qv4l2/ctrl-tab.cpp +++ b/utils/qv4l2/ctrl-tab.cpp @@ -704,7 +704,6 @@ void ApplicationWindow::refresh() void ApplicationWindow::setWhat(QWidget *w, unsigned id, const QString &v) { const v4l2_query_ext_ctrl &qec = m_ctrlMap[id]; - QString what; QString flags = getCtrlFlags(qec.flags); switch (qec.type) { @@ -725,7 +724,6 @@ void ApplicationWindow::setWhat(QWidget *w, unsigned id, const QString &v) void ApplicationWindow::setWhat(QWidget *w, unsigned id, long long v) { const v4l2_query_ext_ctrl &qec = m_ctrlMap[id]; - QString what; QString flags = getCtrlFlags(qec.flags); switch (qec.type) { From patchwork Thu Nov 16 12:24:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 97081 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from ny.mirrors.kernel.org ([147.75.199.223]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r3bQ1-008lsD-MB for patchwork@linuxtv.org; Thu, 16 Nov 2023 12:24:26 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 038751C20878 for ; Thu, 16 Nov 2023 12:24:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B3C030646; Thu, 16 Nov 2023 12:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="p5Xf2otB" X-Original-To: linux-media@vger.kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 561AD18B for ; Thu, 16 Nov 2023 04:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1700137443; x=1700742243; i=ps.report@gmx.net; bh=ySeIlhOOwktLi3B5nIs5oiHBHk5RsCsPVrhMoG88W3o=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=p5Xf2otB22pUWFcJbjwHGoQGw+VDFWCKQflyg7naJsRuTRRJpwZPr20w69toZiTi XSYAzEAoytC7yPWSN+tPmaVXgX6T6sBMQhwV0Zqrtaz+FlcYuoez5iYx38xo4PnO6 z8d1puFNad/hnmkikjLBS+JgtncmwTor+ZwKjObphCyaDcpebNanby1FOeLCNgWvl QlQW4Toa1w2rQR/eGQWr8U0qzUJmc4VsYBmG+aTOyvWL6uWBgbhBaFz61teRa0E+C aMFznnB+UulMrAzdapr6chMvPknDDKiYfnmSWxdjmbcNYsHzNqIKkrzvxb/e55s0d sJWEBNY8W3Ye/EprEQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.247]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MmlT2-1rk7xV2gbO-00jpGU for ; Thu, 16 Nov 2023 13:24:03 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 2/4] qv4l2: enable Qt6 compile with Qt OpenGL support Date: Thu, 16 Nov 2023 13:24:00 +0100 Message-ID: <20231116122402.28730-2-ps.report@gmx.net> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231116122402.28730-1-ps.report@gmx.net> References: <20231116122402.28730-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:OF9ROViI2UjOO9n3JbpqFzM1+zDExdFnwtW/zFyLm1PVMFFAk1T yiZ8zIj0TZcgEntFCvHDxp18mOh2T2Z1KAqfRK8ZLKAQj6NGI+wUu6+tHBqUlQmSYY48Vqv wYLVXMEK30UGDdtl4rOKyzBA4EKFw5r1zGCxP1BMXGKdf5U/H2FraBnr6yUk+t4hqZOcTU8 eotYmggzMUpaO+tLbUqPQ== UI-OutboundReport: notjunk:1;M01:P0:eU51BkVQiM8=;CPuUVyZQaMJVDlcFeeX547xZQHC 6DkIzkvqa9v3kMx+kNs5Mpxg7/rAUQ5Qt5jA0+NNzNn1F04xFewtvIz7BXX4kHd9M8nuyI2g1 TD+HaZdkhUKoSJby+3Zw420+ctJE24PX4d2OqCtoWg6j1rj7VZy85FXH+PFMM7gDVPzI8OVt4 r79v7t3lcHXjO9UHjx6hMigTT6m/MEv8c0gl8hg8rWTr9/3lnGR8Enw4N4mY9MI9I2NwZGXkh uE+X/I7QhxloSnGbn54V7n/syq9k3I1/uWg5eKt6cW+nO6EuF73iZlQcxjT46qRLnr7Guhqwt Hg992FrVgRUZBgoKFh+bn4fNASXEO13umsO0HySvIoBju84xIhWg42QxrW3JIz4SFowvRJHNn hs5H8jIO02JHIE+ql9fa9X3hAVFDJHXzdGbTLlRK/fztWKwstx6x7geNp7Jwy/fLcgTz7Ah+W 0yozSmbmgZcu6R8YD7TTTqFnkU2tF+03sPRpoyWPtU5PsU2DCBHEhqfOMog4W7cZzlBbLEq7G RWBKerSRPs8CfOhdCG3PA3/7FU98EuHX8PzLv+jbkOswHy1HtoCrbdoovh0fyfUGFguKVrNk3 LniqOqca62DbhtWPQytWlVkJutzfg+xG3mAyVnWv4q8yaahQa6KdwvoXxN+Cn+mxcG7yy73vH taE/OrhsvGa1Pk9EmUF/8WcOSvOcspBqVzGqbOtjw6offTkWSCBZ3DlRJa5KpTXjBP3OB51Vz /oAUG1+1XCOKJXgcvXwBmDKsvDdCD+aP5PcAjKVrSr6hRKPBXOaMHmuE5/4d18YhJn0InJ1XS x8MAykPEmoijQ58f6CMuQhltYrRptvJyCQ9qALqfOUF3ivBGoGroZ9Q0aoC6sC6FdSFCIqUeq jkcJnKz96Clar8QbWVxeReCbu6eoUExU27Ftc8ONXfnusd3uDxNr5C5BIKKYOX8U44RGXwd5v 1z48z3mVd9s/EPN62d7/Si1vXAg= X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,MIME_BASE64_TEXT=1.741,RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no Signed-off-by: Peter Seiderer --- utils/qv4l2/capture-win-gl.cpp | 125 ++++++++++++++++++++++++++++++--- utils/qv4l2/capture-win-gl.h | 17 +++++ utils/qv4l2/qv4l2.cpp | 4 ++ utils/qv4l2/qv4l2.pro | 3 + 4 files changed, 138 insertions(+), 11 deletions(-) diff --git a/utils/qv4l2/capture-win-gl.cpp b/utils/qv4l2/capture-win-gl.cpp index 6cbeb426..7e993e3b 100644 --- a/utils/qv4l2/capture-win-gl.cpp +++ b/utils/qv4l2/capture-win-gl.cpp @@ -151,7 +151,9 @@ CaptureWinGLEngine::CaptureWinGLEngine() : m_min_filter(GL_NEAREST) { makeCurrent(); +#if QT_VERSION < 0x060000 m_glfunction.initializeGLFunctions(context()); +#endif } CaptureWinGLEngine::~CaptureWinGLEngine() @@ -285,6 +287,9 @@ void CaptureWinGLEngine::stop() void CaptureWinGLEngine::initializeGL() { +#if QT_VERSION >= 0x060000 + initializeOpenGLFunctions(); +#endif glShadeModel(GL_FLAT); glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); @@ -337,7 +342,11 @@ void CaptureWinGLEngine::setFrame(int width, int height, int WCrop, int HCrop, m_frameData = data; m_frameData2 = data2 ? data2 : data; m_frameData3 = data3 ? data3 : data; +#if QT_VERSION < 0x060000 updateGL(); +#else + update(); +#endif } void CaptureWinGLEngine::checkError(const char *msg) @@ -431,8 +440,13 @@ bool CaptureWinGLEngine::hasNativeFormat(__u32 format) 0 }; +#if QT_VERSION < 0x060000 if (!m_glfunction.hasOpenGLFeature(QGLFunctions::Shaders)) return false; +#else + if (!hasOpenGLFeature(QOpenGLFunctions::Shaders)) + return false; +#endif for (int i = 0; supported_fmts[i]; i++) if (supported_fmts[i] == format) @@ -449,7 +463,11 @@ void CaptureWinGLEngine::changeShader() glMatrixMode(GL_PROJECTION); glLoadIdentity(); glOrtho(0, m_frameWidth, m_frameHeight, 0, 0, 1); +#if QT_VERSION < 0x060000 resizeGL(QGLWidget::width(), QGLWidget::height()); +#else + resizeGL(QOpenGLWidget::width(), QOpenGLWidget::height()); +#endif checkError("Render settings.\n"); switch (m_frameFormat) { @@ -1010,7 +1028,12 @@ void CaptureWinGLEngine::shader_YUV(__u32 format) codeSuffix; bool src_c = m_shaderProgram.addShaderFromSourceCode( - QGLShader::Fragment, codeHead + codeTail); +#if QT_VERSION < 0x060000 + QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif + codeHead + codeTail); if (!src_c) fprintf(stderr, "OpenGL Error: YUV shader compilation failed.\n"); @@ -1053,7 +1076,11 @@ void CaptureWinGLEngine::render_YUV(__u32 format) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#endif glUniform1i(Y, 0); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth, m_frameHeight, m_glRed, GL_UNSIGNED_BYTE, m_frameData); @@ -1061,7 +1088,11 @@ void CaptureWinGLEngine::render_YUV(__u32 format) glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, m_screenTexture[1]); +#if QT_VERSION < 0x060000 GLint U = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "utex"); +#else + GLint U = glGetUniformLocation(m_shaderProgram.programId(), "utex"); +#endif glUniform1i(U, 1); switch (format) { case V4L2_PIX_FMT_YUV422P: @@ -1087,7 +1118,11 @@ void CaptureWinGLEngine::render_YUV(__u32 format) glActiveTexture(GL_TEXTURE2); glBindTexture(GL_TEXTURE_2D, m_screenTexture[2]); +#if QT_VERSION < 0x060000 GLint V = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "vtex"); +#else + GLint V = glGetUniformLocation(m_shaderProgram.programId(), "vtex"); +#endif glUniform1i(V, 2); switch (format) { case V4L2_PIX_FMT_YUV422P: @@ -1189,7 +1224,11 @@ void CaptureWinGLEngine::shader_NV12(__u32 format) codeSuffix; bool src_c = m_shaderProgram.addShaderFromSourceCode( +#if QT_VERSION < 0x060000 QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif QString("%1%2%3").arg(codeHead, codeBody, codeTail)); if (!src_c) @@ -1211,7 +1250,11 @@ void CaptureWinGLEngine::render_NV12(__u32 format) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#endif glUniform1i(Y, 0); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth, m_frameHeight, m_glRed, GL_UNSIGNED_BYTE, m_frameData); @@ -1219,7 +1262,11 @@ void CaptureWinGLEngine::render_NV12(__u32 format) glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, m_screenTexture[1]); +#if QT_VERSION < 0x060000 GLint U = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "uvtex"); +#else + GLint U = glGetUniformLocation(m_shaderProgram.programId(), "uvtex"); +#endif glUniform1i(U, 1); switch (format) { case V4L2_PIX_FMT_NV12: @@ -1307,7 +1354,11 @@ void CaptureWinGLEngine::shader_NV24(__u32 format) codeSuffix; bool src_c = m_shaderProgram.addShaderFromSourceCode( +#if QT_VERSION < 0x060000 QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif QString("%1%2%3").arg(codeHead, codeBody, codeTail)); if (!src_c) @@ -1327,7 +1378,11 @@ void CaptureWinGLEngine::render_NV24(__u32 format) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#endif glUniform1i(Y, 0); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth, m_frameHeight, m_glRed, GL_UNSIGNED_BYTE, m_frameData); @@ -1335,7 +1390,11 @@ void CaptureWinGLEngine::render_NV24(__u32 format) glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, m_screenTexture[1]); +#if QT_VERSION < 0x060000 GLint U = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "uvtex"); +#else + GLint U = glGetUniformLocation(m_shaderProgram.programId(), "uvtex"); +#endif glUniform1i(U, 1); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth, m_frameHeight, m_glRedGreen, GL_UNSIGNED_BYTE, @@ -1419,8 +1478,12 @@ void CaptureWinGLEngine::shader_NV16(__u32 format) codeSuffix; bool src_ok = m_shaderProgram.addShaderFromSourceCode( - QGLShader::Fragment, QString("%1%2%3").arg(codeHead, codeBody, codeTail) - ); +#if QT_VERSION < 0x060000 + QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif + QString("%1%2%3").arg(codeHead, codeBody, codeTail)); if (!src_ok) fprintf(stderr, "OpenGL Error: NV16 shader compilation failed.\n"); @@ -1440,7 +1503,11 @@ void CaptureWinGLEngine::render_NV16(__u32 format) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "ytex"); +#endif glUniform1i(Y, 0); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth, m_frameHeight, m_glRed, GL_UNSIGNED_BYTE, m_frameData); @@ -1448,7 +1515,11 @@ void CaptureWinGLEngine::render_NV16(__u32 format) glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, m_screenTexture[1]); +#if QT_VERSION < 0x060000 GLint UV = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "uvtex"); +#else + GLint UV = glGetUniformLocation(m_shaderProgram.programId(), "uvtex"); +#endif glUniform1i(UV, 1); switch (format) { case V4L2_PIX_FMT_NV16: @@ -1559,8 +1630,12 @@ void CaptureWinGLEngine::shader_YUY2(__u32 format) codeSuffix; bool src_ok = m_shaderProgram.addShaderFromSourceCode( - QGLShader::Fragment, QString("%1%2%3").arg(codeHead, codeBody, codeTail) - ); +#if QT_VERSION < 0x060000 + QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif + QString("%1%2%3").arg(codeHead, codeBody, codeTail)); if (!src_ok) fprintf(stderr, "OpenGL Error: YUY2 shader compilation failed.\n"); @@ -1580,7 +1655,11 @@ void CaptureWinGLEngine::render_YUY2(__u32 format) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#endif glUniform1i(Y, 0); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth / 2, m_frameHeight, GL_RGBA, GL_UNSIGNED_BYTE, m_frameData); @@ -1785,8 +1864,12 @@ void CaptureWinGLEngine::shader_RGB(__u32 format) (hasAlpha ? codeSuffixWithAlpha : codeSuffix); bool src_ok = m_shaderProgram.addShaderFromSourceCode( - QGLShader::Fragment, QString("%1%2").arg(codeHead, codeTail) - ); +#if QT_VERSION < 0x060000 + QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif + QString("%1%2").arg(codeHead, codeTail)); if (!src_ok) fprintf(stderr, "OpenGL Error: RGB shader compilation failed.\n"); @@ -1798,7 +1881,11 @@ void CaptureWinGLEngine::render_RGB(__u32 format) { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#endif glUniform1i(Y, 0); int idx = glGetUniformLocation(m_shaderProgram.programId(), "tex_h"); // Texture height glUniform1f(idx, m_frameHeight); @@ -2016,8 +2103,12 @@ void CaptureWinGLEngine::shader_Bayer(__u32 format) codeSuffix; bool src_ok = m_shaderProgram.addShaderFromSourceCode( - QGLShader::Fragment, QString("%1%2").arg(codeHead, codeTail) - ); +#if QT_VERSION < 0x060000 + QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif + QString("%1%2").arg(codeHead, codeTail)); if (!src_ok) fprintf(stderr, "OpenGL Error: Bayer shader compilation failed.\n"); @@ -2029,7 +2120,11 @@ void CaptureWinGLEngine::render_Bayer(__u32 format) { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#endif glUniform1i(Y, 0); int idx = glGetUniformLocation(m_shaderProgram.programId(), "tex_h"); // Texture height glUniform1f(idx, m_frameHeight); @@ -2146,8 +2241,12 @@ void CaptureWinGLEngine::shader_YUV_packed(__u32 format) (hasAlpha ? codeSuffixWithAlpha : codeSuffix); bool src_ok = m_shaderProgram.addShaderFromSourceCode( - QGLShader::Fragment, QString("%1%2").arg(codeHead, codeTail) - ); +#if QT_VERSION < 0x060000 + QGLShader::Fragment, +#else + QOpenGLShader::Fragment, +#endif + QString("%1%2").arg(codeHead, codeTail)); if (!src_ok) fprintf(stderr, "OpenGL Error: Packed YUV shader compilation failed.\n"); @@ -2159,7 +2258,11 @@ void CaptureWinGLEngine::render_YUV_packed(__u32 format) { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_screenTexture[0]); +#if QT_VERSION < 0x060000 GLint Y = m_glfunction.glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#else + GLint Y = glGetUniformLocation(m_shaderProgram.programId(), "tex"); +#endif glUniform1i(Y, 0); int idx = glGetUniformLocation(m_shaderProgram.programId(), "tex_h"); // Texture height glUniform1f(idx, m_frameHeight); diff --git a/utils/qv4l2/capture-win-gl.h b/utils/qv4l2/capture-win-gl.h index e27b2b3f..96376934 100644 --- a/utils/qv4l2/capture-win-gl.h +++ b/utils/qv4l2/capture-win-gl.h @@ -10,10 +10,17 @@ #define GL_GLEXT_PROTOTYPES #define QT_NO_OPENGL_ES_2 +#include +#if QT_VERSION < 0x060000 #include #include #include #include +#else +#include +#include +#include +#endif #endif #include "qv4l2.h" @@ -26,7 +33,11 @@ // This must be equal to the max number of textures that any shader uses #define MAX_TEXTURES_NEEDED 3 +#if QT_VERSION < 0x060000 class CaptureWinGLEngine : public QGLWidget +#else +class CaptureWinGLEngine : public QOpenGLWidget, protected QOpenGLFunctions +#endif { public: CaptureWinGLEngine(); @@ -102,11 +113,17 @@ private: bool m_formatChange; __u32 m_frameFormat; GLuint m_screenTexture[MAX_TEXTURES_NEEDED]; +#if QT_VERSION < 0x060000 QGLFunctions m_glfunction; +#endif unsigned char *m_frameData; unsigned char *m_frameData2; unsigned char *m_frameData3; +#if QT_VERSION < 0x060000 QGLShaderProgram m_shaderProgram; +#else + QOpenGLShaderProgram m_shaderProgram; +#endif bool m_haveFramebufferSRGB; bool m_hasGLRed; unsigned m_glRed; diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index e37ee87f..534bedb2 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -401,7 +401,11 @@ void ApplicationWindow::setDevice(const QString &device, bool rawOpen) { closeDevice(); m_sigMapper = new QSignalMapper(this); +#if QT_VERSION < 0x060000 connect(m_sigMapper, SIGNAL(mapped(int)), this, SLOT(ctrlAction(int))); +#else + connect(m_sigMapper, &QSignalMapper::mappedInt, this, &ApplicationWindow::ctrlAction); +#endif s_direct(rawOpen); diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 1ea07374..a9343c89 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -8,6 +8,9 @@ CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat +# opengl: to disable opengl suppport on Qt6 comment out the +# following line +greaterThan(QT_MAJOR_VERSION, 5): QT += openglwidgets # adjust to your local meson build path MESON_BUILD_PATH = $$PWD/build-meson From patchwork Thu Nov 16 12:24:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 97079 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from sy.mirrors.kernel.org ([147.75.48.161]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r3bPy-008lrt-SS for patchwork@linuxtv.org; Thu, 16 Nov 2023 12:24:23 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id B9AEDB20A7E for ; Thu, 16 Nov 2023 12:24:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 060F72FE24; Thu, 16 Nov 2023 12:24:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="JPsMW8Q5" X-Original-To: linux-media@vger.kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D092193 for ; Thu, 16 Nov 2023 04:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1700137444; x=1700742244; i=ps.report@gmx.net; bh=PnIxuKgeZ9YAD8D137ZurXp6+J5Nee3xVALdUo8c9SU=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=JPsMW8Q5bUjxhbsESDCf5GhL0SZF9SlLn/jY70T0NEj5O6xLEmsLctsxz3UjiX1h gdCmgbFAIWnVKgZrB1xxyccocxiB/cioH4B6ILBYFwr/OHxgh6aI/mt1aOnNG5fst 8EflcZyt3i95Ft+Zi1FhGJB7V8QLRoypDoyMpMT7RTqsyxD6xe8J0G8peK4v/qXdT nZf6mxPCNnB4m8amvA1DC4oPAgA2z9cyk575fgDgDSxA58d7IZdlzhMjpc3Fpf+el VzJNfHjdihuPSUDWS+zNYsTOakHtBtTC6QRsF8oMPgG78c2Yj2Sknlcfot1JNHE/Y D7GFkQxtCnAFUP6EkQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.247]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MG9gE-1r99Jv3de8-00GZ3o for ; Thu, 16 Nov 2023 13:24:03 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 3/4] qvidcap: fix v4l2_convert_hook (add PRE_TARGETDEPS) Date: Thu, 16 Nov 2023 13:24:01 +0100 Message-ID: <20231116122402.28730-3-ps.report@gmx.net> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231116122402.28730-1-ps.report@gmx.net> References: <20231116122402.28730-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:wnPVx5AtsrG/5RDNbITwygYqgXsIBfrigxnNR4bU0s1qyBTZdHZ 5Zs9la3TegLRftzMogNEhtXLavSYpJ3Ly1tesFkSlQRhDtSnaN1NljvRPertAzciOc5Ka1+ 5PWPMtKlrYd029NEaEg5tKrqQd4W4Oq4BDqwP3gKrVnta13sRyU1LZG1j9VBvRBEpzBf7R/ 39VkW77w94xviuTocXeaA== UI-OutboundReport: notjunk:1;M01:P0:bbETn8W+wNg=;baxnKPWL+k4bKhNPmbz4cUq7xtw AfGsC/Wp51AnZ+VlI6HeWmbTldEDIkWhB+Ld4D+u6Ol01d/IqVDZZgwo1+3JR9sdoOh5qo9MF /DbD5zOZaILKIqdbRkS/X0k3zR2FIwrFChk4z12pGpVxrDrt0b9l7d63cBGUOCQeu+l+PioqQ vQdacQL28TY1V2gQ+5en/ibsFpU9QnInbvTEjRKVTxoZBwNWBWc/aadBc/vYlU2f1W+bWAKNT msdEnfyE1p3g0adXaP9pEzZpsR1UoBhhBInEAQ49RTrC3dIcU8noSXZWpnWWmHYPJSZqdvbWj 5lBuA6EOok5maCXzZ7Z+7zPEHvH7YA2CibJAQYjJZKSfJQuALoZe2dEf/FlGW842UsOhh8q/l Fb4nRm4qRLT343GjKoPiyXtS6ECMqK5/wgSUgZi2ZxS+i8DAzPMfbEX/tM0zNh9qQX42lZybV ZpT3XHnOvenPGtyF9AKy/KXhsiic427bCokRMT0uik8mJ+ajVTkYI8N6HpQko3c26t1Zk2s2H k4YEiUQfNbJkkPHhmvHzbNBUpDH9heR0NkBJVYsHX7hHLDjuVTHYprPR2ATvhLP9vtgR8csYs WU7hQOHzP/7ZQYQKM1fR19UwBscx3XGHS6FaC1joSUEIykBpPJ6QosDNgwCEuE/sCLTGe6BZL nyOLRsDw+MbrlDbwcQhlCLlHc9Zk/MySiohyf/AoqiAA4T4wsObUGr73u+oA7tuXbT5RiNvBD RS7cmZQHspubwe36xFqhecp9fhDAtMaCgpHfVXrzxl7dbknL2iYUhGG6mq5Q4FEIgRk+lyI6v kAzFUawmlSZqXyZvfri3IHqhoHVFJvE3F6ZSzHa9Iuy9hNyBE/L4ETJus7dSICsfcbZfKL+ax j8OjYiq33sP5I/uv+Azrwa8gmQxDspRBquxHbCxTcu6wFcKYAKvmSMzNT4Vm+e5LlYFvjfIF5 HUPAiDNVh2s3uWYn/RJ0z8cs2iU= X-LSpam-Score: -0.8 (/) X-LSpam-Report: No, score=-0.8 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,MIME_BASE64_TEXT=1.741,RCVD_IN_DNSWL_NONE=-0.0001 autolearn=unavailable autolearn_force=no Force early v4l2-convert.h creation by adding the v4l2_convert_hook to PRE_TARGETDEPS. Fixes: ../qvidcap/paint.cpp:318:10: fatal error: v4l2-convert.h: No such file or directory 318 | #include "v4l2-convert.h" Signed-off-by: Peter Seiderer --- utils/qvidcap/qvidcap.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/qvidcap/qvidcap.pro b/utils/qvidcap/qvidcap.pro index db948611..cf7d3ca5 100644 --- a/utils/qvidcap/qvidcap.pro +++ b/utils/qvidcap/qvidcap.pro @@ -25,6 +25,7 @@ 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 +PRE_TARGETDEPS += v4l2_convert_hook # Input HEADERS += capture.h From patchwork Thu Nov 16 12:24:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 97080 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from sy.mirrors.kernel.org ([147.75.48.161]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r3bPz-008lrx-Eh for patchwork@linuxtv.org; Thu, 16 Nov 2023 12:24:24 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id BE6F0B20A77 for ; Thu, 16 Nov 2023 12:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 30FCB2FE2D; Thu, 16 Nov 2023 12:24:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="ozz/vbdW" X-Original-To: linux-media@vger.kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2211196 for ; Thu, 16 Nov 2023 04:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1700137444; x=1700742244; i=ps.report@gmx.net; bh=4WQ+82j6OnH9eYND+COVeQ/JfA5i474Qv5XrvgjTx5w=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=ozz/vbdWtYcW8cEimiv98OWg7E5OkVKXpu6fAowU23vMEHIrZTEVbOQ1aeItV07y PhGrCvoqnsDCZgJNgbgNZHU3gPzs7X6ImdIJ6Zm5ZljnuR+SeOszWEB8p/GZ2j6ON kROO4LCjARTdzABLXiPVb+3w/IliJNlnYlEMnHKlqVjtaapgnwmoZSoAz/00vFecY SLKt1S3SRqkzMAmA4JiDBNfJJBWbp0LIejBmPYP683k467XfSS1UFZ3ZNHgK6rXGj Eiu2OtB3g88OiSCFhi2VA4ScRF8kmgbx/V0rJu+mmbIvDAUxMQPYrZlQSHzHHeSCW uo45Fo/XU19gvtJPAg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.247]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MTRMs-1qw09A059g-00ToaG for ; Thu, 16 Nov 2023 13:24:04 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 4/4] qvidcap: enable Qt6 compile with Qt OpenGL support Date: Thu, 16 Nov 2023 13:24:02 +0100 Message-ID: <20231116122402.28730-4-ps.report@gmx.net> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231116122402.28730-1-ps.report@gmx.net> References: <20231116122402.28730-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:9Xz8RDgQZdfW6i4ohOI24dgXDrPg+52KUMbtW20p1ZHY4xxjs+S EL2vZQ8N5/0SM90WDbnYWVy5sKsRdg0tFhn4ka+H57yV7DzlL1RN4pO20LJhnwk4VJhKXPj K08br99/xngttVzYmPnVpZiAvMOATsOzwuJRDsP9s6Ke79OpEnLEBPH8mMyD6NM2gZ4jNkC zTA3Cx4Bl6nL7AyztwByg== UI-OutboundReport: notjunk:1;M01:P0:YVla5nER0QA=;m5jrd5NDniREOWDViz3kfGZBjvt VcF+8qc5DDclcQ7XXsTcJ23VOycebE90aSQwOBsDEs2B5uVl8NfDDcNoi611Mi2aXnv6gb0B9 Ez+EdIae78QWrPxDj6jXs9Ycw4eodrp/RdiCJ6/ub7NE2TDApObTh2f/zRvUVDOIHeMLP8Aoi RJzmkkVoOuARBBO2IczTSyhVJOZnbzajLq3nerM7w8xjTWaUVTACXO6JdBdQXPb5CaBe77vyO 9Cc4oHWFWbLDRUs9uhqZ7vSbFCqcl0epYJIkrqffSMixBbRI0Agr8pSTHUPX1BhQmQPJA/JYA PkN0xxEcQU8ZOvbv/XOpeav3VG0mXk5AYaty6ikYfIjlScmIA6jYqF5dJwXSF3BQ6PVuXUUaZ 2cdaiXgxlSIXA5DxCkjcrsryFFVhQ9cMNegWyqr0BdrT8ptEQReiNFjfpi5af3nMl4ugMAHSo zo4QNJmtdToVX6uN8aGi9Dy3YQMngzUPgDLZZq9xssxCecn9yu9fnu4crcXfm5rQeZ7KiP5Tq Tw+aqIxMsU4LZCvbdfZZRtnKXntVl+R4hg3KjDJbkKRiqzMI6ThjDrRS3M4eD5CC9S/748Ijb Em4PkbJt2BuyQKFd3UO7nvUYDyidXcfX5RL9Gor+oOP92TKyHe0S4Pl6zAelP9bnVg2+yoFGW HHqvUeMb4wdFyLslkCoNU3v6dWkbC6BLjKyfUWgl9VZwpJOgYPB7lUx68gPPjz5CRyYxedeVw Iu5NboaruBm9XU74rXW7jQgtPf7E2mTqUuPI6UwKe4Ha7zoImum4pnOqsN1P4v7+70/w1y3Fm ege2d1D2L7tkhkjfN7loY/f0LvFmAtKLPRSu0aj5R2/W4HyPiv5PhsHpboLcPyiO7WaxLgPGQ ojc+zSyfnOjwyKs00nMEXYRFCBLb1c3QSxiISq4+4JJtVTRIDSfhyoelc8JC7/88W3i37pAv3 epLlNA== X-LSpam-Score: -0.8 (/) X-LSpam-Report: No, score=-0.8 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,MIME_BASE64_TEXT=1.741,RCVD_IN_DNSWL_NONE=-0.0001 autolearn=unavailable autolearn_force=no - update qmake project file for Qt6 (openglwidgets) - fix includes for Qt6 (QOpenGLShaderProgram instead of QtGui/QOpenGLShaderProgram and QOpenGLPaintDevice instead of QtGui/QOpenGLPaintDevice) Signed-off-by: Peter Seiderer --- utils/qvidcap/capture.cpp | 4 ++++ utils/qvidcap/capture.h | 4 ++++ utils/qvidcap/paint.cpp | 4 ++++ utils/qvidcap/qvidcap.pro | 1 + 4 files changed, 13 insertions(+) diff --git a/utils/qvidcap/capture.cpp b/utils/qvidcap/capture.cpp index 0b4c4115..1e3597b0 100644 --- a/utils/qvidcap/capture.cpp +++ b/utils/qvidcap/capture.cpp @@ -13,7 +13,11 @@ #include #include #include +#if QT_VERSION < 0x060000 #include +#else +#include +#endif #include #include #include diff --git a/utils/qvidcap/capture.h b/utils/qvidcap/capture.h index 37f5bfc5..8ebe76a9 100644 --- a/utils/qvidcap/capture.h +++ b/utils/qvidcap/capture.h @@ -16,7 +16,11 @@ #include #include #include +#if QT_VERSION < 0x060000 #include +#else +#include +#endif #include "qvidcap.h" diff --git a/utils/qvidcap/paint.cpp b/utils/qvidcap/paint.cpp index c5aadb09..0246de60 100644 --- a/utils/qvidcap/paint.cpp +++ b/utils/qvidcap/paint.cpp @@ -13,7 +13,11 @@ #include #include #include +#if QT_VERSION < 0x060000 #include +#else +#include +#endif #include #include #include diff --git a/utils/qvidcap/qvidcap.pro b/utils/qvidcap/qvidcap.pro index cf7d3ca5..d08f0059 100644 --- a/utils/qvidcap/qvidcap.pro +++ b/utils/qvidcap/qvidcap.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 += openglwidgets # adjust to your local meson build path MESON_BUILD_PATH = $$PWD/build-meson