Commit 142c3326 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'kbuild-fixes-v5.8-4' of...

Merge tag 'kbuild-fixes-v5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - clean the generated moc file for xconfig

 - fix xconfig bugs, and revert some bad commits

* tag 'kbuild-fixes-v5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: remove redundant FORCE definition in scripts/Makefile.modpost
  kconfig: qconf: remove wrong ConfigList::firstChild()
  Revert "kconfig: qconf: don't show goback button on splitMode"
  Revert "kconfig: qconf: Change title for the item window"
  kconfig: qconf: remove "goBack" debug message
  kconfig: qconf: use delete[] instead of delete to free array
  kconfig: qconf: compile moc object separately
  kconfig: qconf: use if_changed for qconf.moc rule
  modpost: explain why we can't use strsep
parents 628e04df 28ab576b
...@@ -124,9 +124,6 @@ existing-targets := $(wildcard $(sort $(targets))) ...@@ -124,9 +124,6 @@ existing-targets := $(wildcard $(sort $(targets)))
-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd) -include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)
PHONY += FORCE
FORCE:
endif endif
.PHONY: $(PHONY) .PHONY: $(PHONY)
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
*.moc /qconf-moc.cc
*conf-cfg *conf-cfg
# #
......
...@@ -181,19 +181,22 @@ $(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/mconf-cfg ...@@ -181,19 +181,22 @@ $(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/mconf-cfg
# qconf: Used for the xconfig target based on Qt # qconf: Used for the xconfig target based on Qt
hostprogs += qconf hostprogs += qconf
qconf-cxxobjs := qconf.o qconf-cxxobjs := qconf.o qconf-moc.o
qconf-objs := images.o $(common-objs) qconf-objs := images.o $(common-objs)
HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs) HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs)
HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags) HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
HOSTCXXFLAGS_qconf-moc.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc $(obj)/qconf.o: $(obj)/qconf-cfg
quiet_cmd_moc = MOC $@ quiet_cmd_moc = MOC $@
cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@ cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) $< -o $@
$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg $(obj)/qconf-moc.cc: $(src)/qconf.h $(obj)/qconf-cfg FORCE
$(call cmd,moc) $(call if_changed,moc)
targets += qconf-moc.cc
# gconf: Used for the gconfig target based on GTK+ # gconf: Used for the gconfig target based on GTK+
hostprogs += gconf hostprogs += gconf
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "lkc.h" #include "lkc.h"
#include "qconf.h" #include "qconf.h"
#include "qconf.moc"
#include "images.h" #include "images.h"
...@@ -308,10 +307,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name) ...@@ -308,10 +307,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
setVerticalScrollMode(ScrollPerPixel); setVerticalScrollMode(ScrollPerPixel);
setHorizontalScrollMode(ScrollPerPixel); setHorizontalScrollMode(ScrollPerPixel);
if (mode == symbolMode) setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
else
setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
connect(this, SIGNAL(itemSelectionChanged(void)), connect(this, SIGNAL(itemSelectionChanged(void)),
SLOT(updateSelection(void))); SLOT(updateSelection(void)));
...@@ -392,11 +388,6 @@ void ConfigList::updateSelection(void) ...@@ -392,11 +388,6 @@ void ConfigList::updateSelection(void)
struct menu *menu; struct menu *menu;
enum prop_type type; enum prop_type type;
if (mode == symbolMode)
setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
else
setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
if (selectedItems().count() == 0) if (selectedItems().count() == 0)
return; return;
...@@ -437,14 +428,13 @@ void ConfigList::updateList(ConfigItem* item) ...@@ -437,14 +428,13 @@ void ConfigList::updateList(ConfigItem* item)
if (rootEntry != &rootmenu && (mode == singleMode || if (rootEntry != &rootmenu && (mode == singleMode ||
(mode == symbolMode && rootEntry->parent != &rootmenu))) { (mode == symbolMode && rootEntry->parent != &rootmenu))) {
item = (ConfigItem *)topLevelItem(0); item = (ConfigItem *)topLevelItem(0);
if (!item && mode != symbolMode) { if (!item)
item = new ConfigItem(this, 0, true); item = new ConfigItem(this, 0, true);
last = item; last = item;
}
} }
if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) && if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&
rootEntry->sym && rootEntry->prompt) { rootEntry->sym && rootEntry->prompt) {
item = last ? last->nextSibling() : firstChild(); item = last ? last->nextSibling() : nullptr;
if (!item) if (!item)
item = new ConfigItem(this, last, rootEntry, true); item = new ConfigItem(this, last, rootEntry, true);
else else
...@@ -1239,7 +1229,7 @@ void ConfigInfoView::clicked(const QUrl &url) ...@@ -1239,7 +1229,7 @@ void ConfigInfoView::clicked(const QUrl &url)
if (count < 1) { if (count < 1) {
qInfo() << "Clicked link is empty"; qInfo() << "Clicked link is empty";
delete data; delete[] data;
return; return;
} }
...@@ -1252,7 +1242,7 @@ void ConfigInfoView::clicked(const QUrl &url) ...@@ -1252,7 +1242,7 @@ void ConfigInfoView::clicked(const QUrl &url)
result = sym_re_search(data); result = sym_re_search(data);
if (!result) { if (!result) {
qInfo() << "Clicked symbol is invalid:" << data; qInfo() << "Clicked symbol is invalid:" << data;
delete data; delete[] data;
return; return;
} }
...@@ -1735,7 +1725,6 @@ void ConfigMainWindow::listFocusChanged(void) ...@@ -1735,7 +1725,6 @@ void ConfigMainWindow::listFocusChanged(void)
void ConfigMainWindow::goBack(void) void ConfigMainWindow::goBack(void)
{ {
qInfo() << __FUNCTION__;
if (configList->rootEntry == &rootmenu) if (configList->rootEntry == &rootmenu)
return; return;
......
...@@ -92,10 +92,6 @@ public slots: ...@@ -92,10 +92,6 @@ public slots:
{ {
return this; return this;
} }
ConfigItem* firstChild() const
{
return (ConfigItem *)children().first();
}
void addColumn(colIdx idx) void addColumn(colIdx idx)
{ {
showColumn(idx); showColumn(idx);
......
...@@ -144,6 +144,7 @@ char *get_line(char **stringp) ...@@ -144,6 +144,7 @@ char *get_line(char **stringp)
if (!orig || *orig == '\0') if (!orig || *orig == '\0')
return NULL; return NULL;
/* don't use strsep here, it is not available everywhere */
next = strchr(orig, '\n'); next = strchr(orig, '\n');
if (next) if (next)
*next++ = '\0'; *next++ = '\0';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment