diff options
| author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-05-18 01:36:52 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2009-06-09 22:37:50 +0200 |
| commit | 8d90c97e46930d01e9394bceb6276c7175136bdc (patch) | |
| tree | 21046d46070559b34c81d8ad07f29604d1bc8a46 /scripts | |
| parent | fbb86374445d97072dd994f1a4adf023bfd1e86e (diff) | |
| download | linux-8d90c97e46930d01e9394bceb6276c7175136bdc.tar.gz linux-8d90c97e46930d01e9394bceb6276c7175136bdc.tar.bz2 linux-8d90c97e46930d01e9394bceb6276c7175136bdc.zip | |
kconfig qconf: fix the type of the desktop widget
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 <markus.heidelberg@web.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | 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 afae613ae0d8..19811fcca6d6 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -5,6 +5,7 @@ #include <qapplication.h> #include <qmainwindow.h> +#include <qdesktopwidget.h> #include <qtoolbar.h> #include <qlayout.h> #include <qvbox.h> @@ -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); |