From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 320AFC433DF for ; Thu, 20 Aug 2020 15:17:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 083932086A for ; Thu, 20 Aug 2020 15:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597936642; bh=pUTKYVS9wx5jz8uIHu2lO81UVqpG0LToBJa9im4sPko=; h=From:To:Cc:Subject:Date:List-ID:From; b=Av6bb9VXAKnlH1p+iGdIIBFP/k1Z2eRYv7uE/oK1/VW/GqkuSW3nfPfJrIbHrgKYZ 9rvk9AnB358k5Thj2Hzh6s2Z8382kyOuyMJNM7Mn0wJBDqtN/L9wNx4gki07yqHZ1I iHn+VTvWHDwMjPYBOAEWJr5fU/vvCph9qOUgxOLg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728879AbgHTPRU (ORCPT ); Thu, 20 Aug 2020 11:17:20 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:41946 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728619AbgHTPRP (ORCPT ); Thu, 20 Aug 2020 11:17:15 -0400 Received: from oscar.flets-west.jp (softbank126090211135.bbtec.net [126.90.211.135]) (authenticated) by conuserg-10.nifty.com with ESMTP id 07KFGnDv000586; Fri, 21 Aug 2020 00:16:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 07KFGnDv000586 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1597936610; bh=jTy1QzIhvnmiaRAypycouWs77kNzM/Xh65o7wo9awu4=; h=From:To:Cc:Subject:Date:From; b=VlvFwshsn/aM5lnfjGVCT3HjPBH7XP2x1wXlw2NW69F1VvVu5DeD/mNY6eiNCDRwV KFijhH4aLxabO33L5Ww83IYCSm6H70zyjuchoReUZICrAes1y+Bb0+fXhx3a2nzMoI paXLdQ87uMsKoPc0yKJiakEMrM8LtBrB1ajL/+uMFggEKIhLhkHzx44ztpMh9hkMID rD8nKzCI7HRMSk3i/5Qox580XqKgfW7XN1pHPRFi7lwLLI5AB6BKRUfG+KkcaxDlSR MvasBDye8CVyUX1aZsvRXdqVnhmNODJlH8Amduq/weQ6syjBicXX0L/J28h4fkhK52 PKWRZB1PoyWnQ== X-Nifty-SrcIP: [126.90.211.135] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ronald Warsow , Mauro Carvalho Chehab , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] kconfig: qconf: remove qInfo() to get back Qt4 support Date: Fri, 21 Aug 2020 00:16:46 +0900 Message-Id: <20200820151646.465947-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org qconf is supposed to work with Qt4 and Qt5, but since commit c4f7398bee9c ("kconfig: qconf: make debug links work again"), building with Qt4 fails as follows: HOSTCXX scripts/kconfig/qconf.o scripts/kconfig/qconf.cc: In member function ‘void ConfigInfoView::clicked(const QUrl&)’: scripts/kconfig/qconf.cc:1241:3: error: ‘qInfo’ was not declared in this scope; did you mean ‘setInfo’? 1241 | qInfo() << "Clicked link is empty"; | ^~~~~ | setInfo scripts/kconfig/qconf.cc:1254:3: error: ‘qInfo’ was not declared in this scope; did you mean ‘setInfo’? 1254 | qInfo() << "Clicked symbol is invalid:" << data; | ^~~~~ | setInfo make[1]: *** [scripts/Makefile.host:129: scripts/kconfig/qconf.o] Error 1 make: *** [Makefile:606: xconfig] Error 2 qInfo() does not exist in Qt4. I think these call-sites should be unreachable. qInfo() is not the right one to use, at least. Link: https://lkml.org/lkml/2020/8/19/1096 Fixes: c4f7398bee9c ("kconfig: qconf: make debug links work again") Reported-by: Ronald Warsow Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 5a0aa159ec80..3a8f6251a727 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1238,7 +1238,6 @@ void ConfigInfoView::clicked(const QUrl &url) struct menu *m = NULL; if (count < 1) { - qInfo() << "Clicked link is empty"; delete[] data; return; } @@ -1251,7 +1250,6 @@ void ConfigInfoView::clicked(const QUrl &url) strcat(data, "$"); result = sym_re_search(data); if (!result) { - qInfo() << "Clicked symbol is invalid:" << data; delete[] data; return; } -- 2.25.1