Two files in the kf6-kcmutils tree had active git conflict
markers from a previous merge attempt:
* recipe.toml (lines 31-41): chose upstream branch
(redbear_qt_link_sysroot_dirs ... modules qml). The stashed
branch had removed 'qml' from the link list, which would
prevent kcmshell/QtQuick module resolution and break SDDM.
* source/CMakeLists.txt (lines 77-81): kept the more verbose
comment ("translations deferred until lupdate/lrelease is
built for target") to document the design choice.
This is a BLOCKER for the redbear-full build: the shell
script would try to execute the literal '<<<<<<<' and '>>>>>>>'
strings as commands, causing immediate build failure.
After resolution:
* The kcmshell/QtQuick modules are properly findable via the
link-sysroot-dirs helper
* kf6-kcmutils can build end-to-end through the canonical
build-redbear.sh redbear-full path
Cross-references: See 3D-DRIVER-PLAN.md for the broader
kf6 + QML gating plan.
vasilito
5aa5c96506