Switch cmake_kf5 to cmake_kf6 and enabled Qt6 based building

2026-04-27 12:32:13 +02:00 · 2022-11-02 18:04:33 +01:00
parent 6607d05d9a
commit 23735e9105
79 changed files with 90 additions and 84 deletions
--- a/classes/cmake_kf6.bbclass
+++ b/classes/cmake_kf6.bbclass
@@ -11,6 +11,9 @@ EXTRA_OECMAKE:append:class-native = " \
    -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
    -DBUILD_TESTING=OFF \
    -DBUILD_DESIGNERPLUGIN=OFF \
+    -DBUILD_WITH_QT6=ON \
+    -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.94.0 \
+    -DQT_MAJOR_VERSION=6 \
 "

 EXTRA_OECMAKE:append:class-target = " \
@@ -18,6 +21,9 @@ EXTRA_OECMAKE:append:class-target = " \
    -DBUILD_TESTING=OFF \
    -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake \
    -DBUILD_DESIGNERPLUGIN=OFF \
+    -DBUILD_WITH_QT6=ON \
+    -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.94.0 \
+    -DQT_MAJOR_VERSION=6 \
 "

 DEPENDS:append = " \
@@ -49,11 +55,11 @@ FILES:${PN}:append = " \
    ${datadir}/dbus-1/services/*.service \
    ${datadir}/dbus-1/system-services/*.service \
    ${datadir}/dbus-1/system.d/*.conf \
-    ${datadir}/knotifications5/*.notifyrc \
-    ${datadir}/kservices5/*.desktop \
-    ${datadir}/kservices5/*.protocol \
-    ${datadir}/kservicetypes5/*.desktop \
-    ${datadir}/kservices5/*.desktop \
+    ${datadir}/knotifications6/*.notifyrc \
+    ${datadir}/kservices6/*.desktop \
+    ${datadir}/kservices6/*.protocol \
+    ${datadir}/kservicetypes6/*.desktop \
+    ${datadir}/kservices6/*.desktop \
    ${datadir}/polkit-1/actions/*.policy \
 "

@@ -62,7 +68,7 @@ FILES:${PN}-dev:append = " \
    ${datadir}/dbus-1/interfaces/*.xml \
    ${datadir}/kdevappwizard/templates/*.tar.bz2 \
    ${datadir}/kdevfiletemplates/templates/*.tar.bz2 \
-    ${datadir}/qlogging-categories5 \
+    ${datadir}/qlogging-categories6 \
    ${libdir}/cmake \
    ${libdir}/plugins/designer/*.so \
    ${prefix}/mkspecs/modules/qt_*.pri \
--- a/recipes-kdesupport/polkit-qt-1.inc
+++ b/recipes-kdesupport/polkit-qt-1.inc
@@ -12,7 +12,7 @@ DEPENDS = "qtbase polkit"
 SRC_URI = "git://invent.kde.org/libraries/polkit-qt-1.git;nobranch=1;protocol=https"
 S = "${WORKDIR}/git"

-inherit cmake_kf5
+inherit cmake_kf6

 FILES:${PN}-dev += " \
    ${libdir}/cmake/PolkitQt5-1/* \
--- a/recipes-kf5/obsolete/kdelibs4support.inc
+++ b/recipes-kf5/obsolete/kdelibs4support.inc
@@ -35,7 +35,7 @@ EXTRA_OECMAKE:append:class-target = " \
 "

 require kdelibs4support_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit perlnative
 inherit kdoctools
--- a/recipes-kf5/obsolete/kdesignerplugin.inc
+++ b/recipes-kf5/obsolete/kdesignerplugin.inc
@@ -14,7 +14,7 @@ DEPENDS = " \
 "

 require kdesignerplugin_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6

 FILES:${PN}-dev += " \
  ${datadir}/kf5/widgets/pics/*.png \
--- a/recipes-kf5/obsolete/kjs.inc
+++ b/recipes-kf5/obsolete/kjs.inc
@@ -10,7 +10,7 @@ PR = "r0"
 DEPENDS = "qtbase kjs-native pcre"

 require kjs_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit perlnative

 sysroot_stage_all:append:class-native () {
--- a/recipes-kf5/obsolete/kjsembed.inc
+++ b/recipes-kf5/obsolete/kjsembed.inc
@@ -15,5 +15,5 @@ DEPENDS = " \
 "

 require kjsembed_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
--- a/recipes-kf5/tier1/attica.inc
+++ b/recipes-kf5/tier1/attica.inc
@@ -13,5 +13,5 @@ DEPENDS = " \
 "

 require attica_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/bluez-qt.inc
+++ b/recipes-kf5/tier1/bluez-qt.inc
@@ -10,7 +10,7 @@ PR = "r0"
 DEPENDS = "qtbase"

 require bluez-qt_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 EXTRA_OECMAKE:class-target += " \
--- a/recipes-kf5/tier1/breeze-icons.inc
+++ b/recipes-kf5/tier1/breeze-icons.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"

 require breeze-icons_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 # bash is in the hosttools folder in PATH, but that's not detected automatically
 # due to the CMAKE_FIND_ROOT_PATH settings
 EXTRA_OECMAKE:class-target += " -DBASH_EXE=`which bash`"
--- a/recipes-kf5/tier1/karchive.inc
+++ b/recipes-kf5/tier1/karchive.inc
@@ -14,5 +14,5 @@ PR = "r0"
 DEPENDS = "zlib bzip2 xz qtbase"

 require karchive_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kcalendarcore.inc
+++ b/recipes-kf5/tier1/kcalendarcore.inc
@@ -15,5 +15,5 @@ DEPENDS = " \
 "

 require kcalendarcore_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kcodecs.inc
+++ b/recipes-kf5/tier1/kcodecs.inc
@@ -11,5 +11,5 @@ PR = "r0"
 DEPENDS = "qtbase gperf-native"

 require kcodecs_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kconfig.inc
+++ b/recipes-kf5/tier1/kconfig.inc
@@ -12,7 +12,7 @@ PR = "r0"
 DEPENDS = "qtbase kconfig-native"

 require kconfig_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
 EXTRA_OECMAKE:class-native = " -DKCONFIG_USE_GUI=OFF"

--- a/recipes-kf5/tier1/kcoreaddons.inc
+++ b/recipes-kf5/tier1/kcoreaddons.inc
@@ -12,7 +12,7 @@ PR = "r0"
 DEPENDS = "qtbase kcoreaddons-native"

 require kcoreaddons_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
 inherit mime-xdg
 inherit mime
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -11,5 +11,5 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kdbusaddons_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kdnssd.inc
+++ b/recipes-kf5/tier1/kdnssd.inc
@@ -11,5 +11,5 @@ PR = "r0"
 DEPENDS = "qtbase avahi"

 require kdnssd_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kguiaddons.inc
+++ b/recipes-kf5/tier1/kguiaddons.inc
@@ -20,7 +20,7 @@ DEPENDS = " \
 "

 require kguiaddons_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit mime-xdg
 inherit reuse_license_checksums

--- a/recipes-kf5/tier1/kholidays.inc
+++ b/recipes-kf5/tier1/kholidays.inc
@@ -9,7 +9,7 @@ PR = "r0"
 DEPENDS += "qtbase"

 require kholidays_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/ki18n.inc
+++ b/recipes-kf5/tier1/ki18n.inc
@@ -20,7 +20,7 @@ DEPENDS:class-target = " \
 "

 require ki18n_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit python3native
 inherit reuse_license_checksums

--- a/recipes-kf5/tier1/kidletime.inc
+++ b/recipes-kf5/tier1/kidletime.inc
@@ -16,7 +16,7 @@ DEPENDS = " \
 "

 require kidletime_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/kimageformats.inc
+++ b/recipes-kf5/tier1/kimageformats.inc
@@ -11,7 +11,7 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kimageformats_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN}-dbg += " \
--- a/recipes-kf5/tier1/kirigami.inc
+++ b/recipes-kf5/tier1/kirigami.inc
@@ -12,7 +12,7 @@ DEPENDS = " \
 "

 require kirigami_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/kitemmodels.inc
+++ b/recipes-kf5/tier1/kitemmodels.inc
@@ -11,7 +11,7 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kitemmodels_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/kitemviews.inc
+++ b/recipes-kf5/tier1/kitemviews.inc
@@ -11,5 +11,5 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kitemviews_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kplotting.inc
+++ b/recipes-kf5/tier1/kplotting.inc
@@ -11,5 +11,5 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kplotting_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kquickcharts.inc
+++ b/recipes-kf5/tier1/kquickcharts.inc
@@ -12,7 +12,7 @@ DEPENDS = " \
 "

 require kquickcharts_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/kwayland.inc
+++ b/recipes-kf5/tier1/kwayland.inc
@@ -18,5 +18,5 @@ DEPENDS = " \
 "

 require kwayland_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier1/kwidgetsaddons.inc
+++ b/recipes-kf5/tier1/kwidgetsaddons.inc
@@ -11,7 +11,7 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kwidgetsaddons_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 PACKAGES += "${PN}-data"
--- a/recipes-kf5/tier1/kwindowsystem.inc
+++ b/recipes-kf5/tier1/kwindowsystem.inc
@@ -14,7 +14,7 @@ DEPENDS = " \
 "

 require kwindowsystem_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/modemmanager-qt.inc
+++ b/recipes-kf5/tier1/modemmanager-qt.inc
@@ -9,7 +9,7 @@ PR = "r0"
 DEPENDS = "qtbase modemmanager"

 require modemmanager-qt_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 RDEPENDS:${PN} += "modemmanager"
--- a/recipes-kf5/tier1/networkmanager-qt.inc
+++ b/recipes-kf5/tier1/networkmanager-qt.inc
@@ -9,7 +9,7 @@ PR = "r0"
 DEPENDS = "qtbase networkmanager"

 require networkmanager-qt_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 RDEPENDS:${PN} += "networkmanager"
--- a/recipes-kf5/tier1/oxygen-icons5.inc
+++ b/recipes-kf5/tier1/oxygen-icons5.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"

 require oxygen-icons5_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6

 FILES:${PN} += " \
    ${datadir}/icons/oxygen/index.theme \
--- a/recipes-kf5/tier1/prison.inc
+++ b/recipes-kf5/tier1/prison.inc
@@ -10,7 +10,7 @@ PR = "r0"
 DEPENDS = "qtbase qtdeclarative qrencode libdmtx"

 require prison_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/solid.inc
+++ b/recipes-kf5/tier1/solid.inc
@@ -12,7 +12,7 @@ PR = "r0"
 DEPENDS = "qtbase bison-native"

 require solid_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier1/sonnet.inc
+++ b/recipes-kf5/tier1/sonnet.inc
@@ -13,7 +13,7 @@ DEPENDS = " \
 "

 require sonnet_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 EXTRA_OECMAKE:append:class-native = " -DSONNET_USE_WIDGETS=OFF -DSONNET_USE_QML=OFF"
--- a/recipes-kf5/tier1/syntax-highlighting.inc
+++ b/recipes-kf5/tier1/syntax-highlighting.inc
@@ -15,7 +15,7 @@ DEPENDS = " \
 "

 require syntax-highlighting_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit perlnative
 inherit reuse_license_checksums

--- a/recipes-kf5/tier1/threadweaver.inc
+++ b/recipes-kf5/tier1/threadweaver.inc
@@ -11,5 +11,5 @@ PR = "r0"
 DEPENDS = "qtbase"

 require threadweaver_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kactivities.inc
+++ b/recipes-kf5/tier2/kactivities.inc
@@ -18,7 +18,7 @@ DEPENDS = " \
 "

 require kactivities_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier2/kauth.inc
+++ b/recipes-kf5/tier2/kauth.inc
@@ -11,7 +11,7 @@ DEPENDS:class-native = "extra-cmake-modules qtbase-native kcoreaddons-native"
 DEPENDS:class-target = "qtbase kcoreaddons kauth-native polkit-qt-1"

 require kauth_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 EXTRA_OECMAKE:class-target = " \
--- a/recipes-kf5/tier2/kcompletion.inc
+++ b/recipes-kf5/tier2/kcompletion.inc
@@ -14,5 +14,5 @@ DEPENDS = " \
 "

 require kcompletion_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kcontacts.inc
+++ b/recipes-kf5/tier2/kcontacts.inc
@@ -17,6 +17,6 @@ DEPENDS = " \
 "

 require kcontacts_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kcrash.inc
+++ b/recipes-kf5/tier2/kcrash.inc
@@ -15,5 +15,5 @@ DEPENDS = " \
 "

 require kcrash_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kdoctools.inc
+++ b/recipes-kf5/tier2/kdoctools.inc
@@ -19,7 +19,7 @@ DEPENDS = " \
 "

 require kdoctools_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit gettext
 inherit python3native
 inherit perlnative
--- a/recipes-kf5/tier2/kfilemetadata.inc
+++ b/recipes-kf5/tier2/kfilemetadata.inc
@@ -15,7 +15,7 @@ DEPENDS = " \
 "

 require kfilemetadata_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit features_check
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kjobwidgets.inc
+++ b/recipes-kf5/tier2/kjobwidgets.inc
@@ -18,5 +18,5 @@ DEPENDS = " \
 "

 require kjobwidgets_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/knotifications.inc
+++ b/recipes-kf5/tier2/knotifications.inc
@@ -17,7 +17,7 @@ DEPENDS = " \
 "

 require knotifications_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -25,6 +25,6 @@ FILES:${PN}-tools += "\
 "

 require kpackage_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kpty.inc
+++ b/recipes-kf5/tier2/kpty.inc
@@ -16,6 +16,6 @@ DEPENDS = " \
 EXTRA_OECMAKE += "-DCMAKE_DISABLE_FIND_PACKAGE_UTEMPTER=ON"

 require kpty_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/kunitconversion.inc
+++ b/recipes-kf5/tier2/kunitconversion.inc
@@ -11,6 +11,6 @@ PR = "r0"
 DEPENDS = "qtbase"

 require kunitconversion_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier2/syndication.inc
+++ b/recipes-kf5/tier2/syndication.inc
@@ -12,5 +12,5 @@ DEPENDS = " \
 "

 require syndication_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/baloo.inc
+++ b/recipes-kf5/tier3/baloo.inc
@@ -26,7 +26,7 @@ DEPENDS = " \
 "

 require baloo_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kactivities-stats.inc
+++ b/recipes-kf5/tier3/kactivities-stats.inc
@@ -20,5 +20,5 @@ DEPENDS = " \
 "

 require kactivities-stats_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kbookmarks.inc
+++ b/recipes-kf5/tier3/kbookmarks.inc
@@ -21,5 +21,5 @@ DEPENDS = " \
 "

 require kbookmarks_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kcmutils.inc
+++ b/recipes-kf5/tier3/kcmutils.inc
@@ -30,7 +30,7 @@ DEPENDS:class-native = " \
 "

 require kcmutils_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kconfigwidgets.inc
+++ b/recipes-kf5/tier3/kconfigwidgets.inc
@@ -20,7 +20,7 @@ DEPENDS = "qtbase \
 "

 require kconfigwidgets_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kdav.inc
+++ b/recipes-kf5/tier3/kdav.inc
@@ -15,7 +15,7 @@ DEPENDS = " \
 "

 require kdav_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit kdoctools
 inherit kconfig
 inherit kauth
--- a/recipes-kf5/tier3/kdeclarative.inc
+++ b/recipes-kf5/tier3/kdeclarative.inc
@@ -27,7 +27,7 @@ DEPENDS = " \
 "

 require kdeclarative_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kded.inc
+++ b/recipes-kf5/tier3/kded.inc
@@ -21,7 +21,7 @@ DEPENDS = " \
 "

 require kded_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit kdoctools
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kdesu.inc
+++ b/recipes-kf5/tier3/kdesu.inc
@@ -17,6 +17,6 @@ DEPENDS = " \
 "

 require kdesu_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kemoticons.inc
+++ b/recipes-kf5/tier3/kemoticons.inc
@@ -17,7 +17,7 @@ DEPENDS = " \
 "

 require kemoticons_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier3/kglobalaccel.inc
+++ b/recipes-kf5/tier3/kglobalaccel.inc
@@ -18,7 +18,7 @@ DEPENDS = " \
 "

 require kglobalaccel_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier3/kiconthemes.inc
+++ b/recipes-kf5/tier3/kiconthemes.inc
@@ -19,7 +19,7 @@ DEPENDS = "qtbase \
 "

 require kiconthemes_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kinit.inc
+++ b/recipes-kf5/tier3/kinit.inc
@@ -20,7 +20,7 @@ DEPENDS = " \
 "

 require kinit_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit kdoctools
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kio.inc
+++ b/recipes-kf5/tier3/kio.inc
@@ -27,7 +27,7 @@ DEPENDS = " \
 "

 require kio_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit kcoreaddons
 inherit kconfig
 inherit ki18n
--- a/recipes-kf5/tier3/knewstuff.inc
+++ b/recipes-kf5/tier3/knewstuff.inc
@@ -33,7 +33,7 @@ DEPENDS = " \
 "

 require knewstuff_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/knotifyconfig.inc
+++ b/recipes-kf5/tier3/knotifyconfig.inc
@@ -20,6 +20,6 @@ DEPENDS = " \
 "

 require knotifyconfig_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kparts.inc
+++ b/recipes-kf5/tier3/kparts.inc
@@ -25,6 +25,6 @@ DEPENDS = " \
 "

 require kparts_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kpeople.inc
+++ b/recipes-kf5/tier3/kpeople.inc
@@ -19,7 +19,7 @@ DEPENDS = " \
 "

 require kpeople_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/krunner.inc
+++ b/recipes-kf5/tier3/krunner.inc
@@ -25,7 +25,7 @@ DEPENDS = " \
 "

 require krunner_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/kservice.inc
+++ b/recipes-kf5/tier3/kservice.inc
@@ -17,6 +17,6 @@ DEPENDS = "qtbase \
 "

 require kservice_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/ktexteditor.inc
+++ b/recipes-kf5/tier3/ktexteditor.inc
@@ -24,7 +24,7 @@ DEPENDS = " \
 "

 require ktexteditor_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums

--- a/recipes-kf5/tier3/ktextwidgets.inc
+++ b/recipes-kf5/tier3/ktextwidgets.inc
@@ -20,6 +20,6 @@ DEPENDS = "qtbase \
 "

 require ktextwidgets_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kwallet.inc
+++ b/recipes-kf5/tier3/kwallet.inc
@@ -30,6 +30,6 @@ EXTRA_OECMAKE += " \

 inherit pkgconfig
 require kwallet_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kxmlgui.inc
+++ b/recipes-kf5/tier3/kxmlgui.inc
@@ -22,6 +22,6 @@ DEPENDS = "qtbase \
 "

 require kxmlgui_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/kxmlrpcclient.inc
+++ b/recipes-kf5/tier3/kxmlrpcclient.inc
@@ -16,7 +16,7 @@ DEPENDS = " \
 "

 require kxmlrpcclient_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit gettext
 inherit python3native
 inherit kdoctools
--- a/recipes-kf5/tier3/plasma-framework.inc
+++ b/recipes-kf5/tier3/plasma-framework.inc
@@ -34,7 +34,7 @@ DEPENDS = " \
 "

 require plasma-framework_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit kdoctools
 inherit reuse_license_checksums
--- a/recipes-kf5/tier3/purpose.inc
+++ b/recipes-kf5/tier3/purpose.inc
@@ -21,7 +21,7 @@ DEPENDS = " \
 "

 require purpose_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit gettext
 inherit python3native
 inherit kdoctools
--- a/recipes-kf5/tier3/qqc2-desktop-style.inc
+++ b/recipes-kf5/tier3/qqc2-desktop-style.inc
@@ -18,7 +18,7 @@ DEPENDS = " \
 "

 require qqc2-desktop-style_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit reuse_license_checksums

 FILES:${PN} += " \
--- a/recipes-kf5/tier4/frameworkintegration.inc
+++ b/recipes-kf5/tier4/frameworkintegration.inc
@@ -22,7 +22,7 @@ DEPENDS = " \
 "

 require frameworkintegration_metainfo.inc
-inherit cmake_kf5
+inherit cmake_kf6
 inherit ki18n
 inherit kdoctools
 inherit reuse_license_checksums