summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-21 05:17:52 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-21 05:17:52 +0200
commit093faa1dd26fc6766f8f04c429030757a8a0def4 (patch)
treeeeee443b1bed650293f51a49b908f689c1dbb997 /scripts
parentNew maintainers for the x86 (32-bit and 64-bit) architecture (diff)
parentkbuild: restore arch/{ppc/xtensa}/boot cflags (diff)
downloadlinux-093faa1dd26fc6766f8f04c429030757a8a0def4.tar.xz
linux-093faa1dd26fc6766f8f04c429030757a8a0def4.zip
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: restore arch/{ppc/xtensa}/boot cflags kconfig: set title bar in xconfig kbuild: fix toplevel Makefile/depmod
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/qconf.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index e4eeb59a8c24..b9bb32dfd628 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1274,8 +1274,12 @@ ConfigMainWindow::ConfigMainWindow(void)
QMenuBar* menu;
bool ok;
int x, y, width, height;
+ char title[256];
QWidget *d = configApp->desktop();
+ snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
+ getenv("KERNELVERSION"));
+ setCaption(title);
width = configSettings->readNumEntry("/window width", d->width() - 64);
height = configSettings->readNumEntry("/window height", d->height() - 64);