kf6-kcmutils: resolve git conflict markers in recipe + source

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.

local/recipes/kde/kf6-kcmutils/recipe.toml

@@ -28,17 +28,7 @@ DYNAMIC_INIT
 
 HOST_BUILD="${COOKBOOK_ROOT}/build/qt-host-build"
 
-<<<<<<< Updated upstream
 redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules qml
-
-=======
-redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules
-
-# The local source tree is now at upstream 6.27.0 with QML/Quick/kcmshell
-# restored. Only poqm translations remain disabled (lupdate/lrelease not yet
-# built for target). The Red Bear-specific changes live as a durable external
-# patch in local/patches/kf6-kcmutils/.
->>>>>>> Stashed changes
 REDBEAR_PATCHES_DIR="${REDBEAR_PATCHES_DIR:-$(cd "$(dirname "${COOKBOOK_RECIPE}")/../../../.." && pwd)}/local/patches/kf6-kcmutils"
 cookbook_apply_patches "${REDBEAR_PATCHES_DIR}"
 

local/recipes/kde/kf6-kcmutils/source/CMakeLists.txt

@@ -74,11 +74,7 @@ ecm_set_disabled_deprecation_versions(
 ecm_find_qmlmodule(org.kde.kirigami REQUIRED)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kcmutils6\")
-<<<<<<< Updated upstream
-#ki18n_install(po)  # translations deferred
-=======
 #ki18n_install(po)  # translations deferred until lupdate/lrelease is built for target
->>>>>>> Stashed changes
 add_subdirectory(src)
 add_subdirectory(tools)
 if(BUILD_TESTING)