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: 91330 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1pnmEp-001x4g-72; Sat, 15 Apr 2023 20:11:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbjDOULG (ORCPT + 1 other); 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= X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 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 autolearn=ham autolearn_force=no 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;