Linus Torvalds 152813e6e4 Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ... Pull kconfig updates from Michal Marek: - 'make xconfig' ported to Qt5, dropping support for Qt3 - merge_config.sh supports a single-input-file mode and also respects $KCONFIG_CONFIG - Fix for incorrect display of >= and > in dependency expressions * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (44 commits) Add current selection check. Use pkg-config to find Qt 4 and 5 instead of direct qmake kconfig: Fix copy&paste error kconfig/merge_config.sh: Accept a single file kconfig/merge_config.sh: Support KCONFIG_CONFIG Update the buildsystem for KConfig finding Qt Port xconfig to Qt5 - Update copyright. Port xconfig to Qt5 - Fix goParent issue. Port xconfig to Qt5 - on Back clicked, deselect old item. Port xconfig to Qt5 - Add(back) one click checkbox toggle. Port xconfig to Qt5 - Add(back) lineedit editing. Port xconfig to Qt5 - Remove some commented code. Port xconfig to Qt5 - Source format. Port xconfig to Qt5 - Add horizontal scrollbar, and scroll per pixel. Port xconfig to Qt5 - Change ConfigItem constructor parent type. Port xconfig to Qt5 - Disable ConfigList soring Port xconfig to Qt5 - Remove ConfigList::updateMenuList template. Port xconfig to Qt5 - Add ConfigList::mode to initializer list. Port xconfig to Qt5 - Add ConfigItem::nextItem to initializer list. Port xconfig to Qt5 - Tree widget set column titles. ...		2015-11-10 21:06:50 -08:00
..
lxdialog
.gitignore
check.sh
conf.c
confdata.c
expr.c	kconfig: Fix copy&paste error	2015-10-20 19:13:14 +02:00
expr.h
gconf.c
gconf.glade
images.c
kxgettext.c
list.h
lkc_proto.h
lkc.h
Makefile	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-11-10 21:06:50 -08:00
mconf.c
menu.c
merge_config.sh	kconfig/merge_config.sh: Accept a single file	2015-10-14 16:19:37 +02:00
nconf.c
nconf.gui.c
nconf.h
POTFILES.in
qconf.cc	Add current selection check.	2015-11-02 21:43:58 +01:00
qconf.h	Port xconfig to Qt5 - Source format.	2015-10-14 14:59:03 +02:00
streamline_config.pl
symbol.c	kbuild: document recursive dependency limitation / resolution	2015-10-08 15:36:16 +02:00
util.c
zconf.gperf	kconfig: warn of unhandled characters in Kconfig commands	2015-08-19 17:05:39 +02:00
zconf.hash.c_shipped	kconfig: Regenerate shipped zconf.{hash,lex}.c files	2015-08-19 17:05:39 +02:00
zconf.l	kconfig: warn of unhandled characters in Kconfig commands	2015-08-19 17:05:39 +02:00
zconf.lex.c_shipped	kconfig: Regenerate shipped zconf.{hash,lex}.c files	2015-08-19 17:05:39 +02:00
zconf.tab.c_shipped
zconf.y