On Wed, 17 Dec 2025 at 00:39, Randy Dunlap <rdunlap@infradead.org> wrote:
>
> Yes, "make xconfig" worked properly before applying this patch.
>
> .qconf.cmd (generated by build) tells me I am using Qt6.
> I don't see any build errors/warnings.
>
> qt-core-devel & qt-base-common-devel are v6.10.1-1.2 from
> openSUSE Tumbleweed.
Finally I figured out why "make xconfig" was failing with Qt6 on my machine.
Because I didn't clean properly between trying it with Qt5 and Qt6. After I
ran "make distclean", "make xconfig" runs properly with qt6-qtbase-devel
too.
Then I've noticed that I inconsistently used two different versions of the
"srctree" environment variable - lowercased (right) from lkc.h in GTK code
and uppercased (wrong) literal in Qt code. There is a fallback to
QDir::currentPath() in the Qt code code and it seems like it works
differently in my Fedora 43 and in your openSUSE Tumbleweed.
In this version of my patch I've fixed that inconsistenly. Hope now it works
properly in all systems with Qt.
Rostislav Krasny (1):
kconfig: move XPM icons to separate files
scripts/kconfig/Makefile | 4 +-
scripts/kconfig/gconf.c | 35 ++-
scripts/kconfig/icons/back.xpm | 29 +++
scripts/kconfig/icons/choice_no.xpm | 18 ++
scripts/kconfig/icons/choice_yes.xpm | 18 ++
scripts/kconfig/icons/load.xpm | 31 +++
scripts/kconfig/icons/menu.xpm | 18 ++
scripts/kconfig/icons/menuback.xpm | 18 ++
scripts/kconfig/icons/save.xpm | 31 +++
scripts/kconfig/icons/single_view.xpm | 28 +++
scripts/kconfig/icons/split_view.xpm | 28 +++
scripts/kconfig/icons/symbol_mod.xpm | 18 ++
scripts/kconfig/icons/symbol_no.xpm | 18 ++
scripts/kconfig/icons/symbol_yes.xpm | 18 ++
scripts/kconfig/icons/tree_view.xpm | 28 +++
scripts/kconfig/images.c | 328 --------------------------
scripts/kconfig/images.h | 33 ---
scripts/kconfig/qconf.cc | 29 ++-
18 files changed, 345 insertions(+), 385 deletions(-)
create mode 100644 scripts/kconfig/icons/back.xpm
create mode 100644 scripts/kconfig/icons/choice_no.xpm
create mode 100644 scripts/kconfig/icons/choice_yes.xpm
create mode 100644 scripts/kconfig/icons/load.xpm
create mode 100644 scripts/kconfig/icons/menu.xpm
create mode 100644 scripts/kconfig/icons/menuback.xpm
create mode 100644 scripts/kconfig/icons/save.xpm
create mode 100644 scripts/kconfig/icons/single_view.xpm
create mode 100644 scripts/kconfig/icons/split_view.xpm
create mode 100644 scripts/kconfig/icons/symbol_mod.xpm
create mode 100644 scripts/kconfig/icons/symbol_no.xpm
create mode 100644 scripts/kconfig/icons/symbol_yes.xpm
create mode 100644 scripts/kconfig/icons/tree_view.xpm
delete mode 100644 scripts/kconfig/images.c
delete mode 100644 scripts/kconfig/images.h
--
2.52.0