Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755943AbZFEXpb (ORCPT ); Fri, 5 Jun 2009 19:45:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756114AbZFEXlj (ORCPT ); Fri, 5 Jun 2009 19:41:39 -0400 Received: from pfepb.post.tele.dk ([195.41.46.236]:36409 "EHLO pfepb.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755559AbZFEXlN (ORCPT ); Fri, 5 Jun 2009 19:41:13 -0400 From: Sam Ravnborg To: linux-kbuild , LKML Cc: Markus Heidelberg , Sam Ravnborg Subject: [PATCH 30/39] kconfig qconf: fix the type of the desktop widget Date: Sat, 6 Jun 2009 01:42:48 +0200 Message-Id: <1244245377-17441-30-git-send-email-sam@ravnborg.org> X-Mailer: git-send-email 1.6.3.rc3.40.g75b44 In-Reply-To: <20090605233720.GA13588@uranus.ravnborg.org> References: <20090605233720.GA13588@uranus.ravnborg.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1562 Lines: 46 From: Markus Heidelberg QApplication::desktop() returns a pointer to QDesktopWidget, not to QWidget. Fixes the following compiler error after a quick conversion with 'qt3to4', which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2. scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()': scripts/kconfig/qconf.cc:1289: error: cannot convert 'QDesktopWidget*' to 'QWidget*' in initialization Signed-off-by: Markus Heidelberg Signed-off-by: Sam Ravnborg --- scripts/kconfig/qconf.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index afae613..19811fc 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -1275,7 +1276,7 @@ ConfigMainWindow::ConfigMainWindow(void) int x, y, width, height; char title[256]; - QWidget *d = configApp->desktop(); + QDesktopWidget *d = configApp->desktop(); snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"), getenv("KERNELVERSION")); setCaption(title); -- 1.6.3.rc3.40.g75b44 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/