Convert to new override syntax

This is the result of automated script (0.9.3) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Change-Id: I23f9e955618b36878635b17265f0d8bb81a5cf55
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

classes/populate_sdk_qt6_base.bbclass

@@ -1,13 +1,13 @@
 inherit qt6-paths
 
-SDK_POSTPROCESS_COMMAND_prepend = "create_qt6_sdk_files;"
+SDK_POSTPROCESS_COMMAND:prepend = "create_qt6_sdk_files;"
 
 
 PATH_DELIM = ":"
-PATH_DELIM_sdkmingw32 = ";"
+PATH_DELIM:sdkmingw32 = ";"
 
 QT6_INSTALL_HOST_LIBEXECDIR = "${QT6_INSTALL_LIBEXECDIR}"
-QT6_INSTALL_HOST_LIBEXECDIR_sdkmingw32 = "${QT6_INSTALL_LIBEXECDIR_mingw32}"
+QT6_INSTALL_HOST_LIBEXECDIR:sdkmingw32 = "${QT6_INSTALL_LIBEXECDIR:mingw32}"
 
 create_qt6_sdk_files () {
     # Generate a qt.conf file to be deployed with the SDK
@@ -107,7 +107,7 @@ EOF
 
 }
 
-create_qt6_sdk_files_append_sdkmingw32() {
+create_qt6_sdk_files:append:sdkmingw32() {
     sed -i -e 's|${SDKPATH}|$ENV{SDKPATH}|g' \
         ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake
 }

classes/qt6-cmake.bbclass

@@ -1,16 +1,16 @@
 inherit cmake python3native perlnative qt6-paths
 
-DEPENDS_prepend = "qtbase-native "
+DEPENDS:prepend = "qtbase-native "
 
 EXTRA_OECMAKE += "\
     -DQT_CMAKE_DEBUG_EXTEND_TARGET=ON \
     -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
     -DQT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX=ON \
 "
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
     -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}/${prefix_native}/ \
 "
-EXTRA_OECMAKE_append_class-nativesdk = "\
+EXTRA_OECMAKE:append:class-nativesdk = "\
     -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}/${prefix_native}/ \
 "
 
@@ -32,7 +32,7 @@ EXTRA_OECMAKE += "\
     -DINSTALL_MKSPECSDIR:PATH=${@os.path.relpath(d.getVar('QT6_INSTALL_MKSPECSDIR'), d.getVar('prefix') + '/')} \
 "
 
-do_install_append() {
+do_install:append() {
     # Replace host paths with qmake built-in properties QTBUG-84725
     find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \
         sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \

classes/qt6-paths.bbclass

@@ -12,7 +12,7 @@ QT6_INSTALL_ARCHDATADIR ?= "${libdir}"
 QT6_INSTALL_PLUGINSDIR ?= "${libdir}/plugins"
 # Helper programs [ARCHDATADIR/bin on Windows, ARCHDATADIR/libexec otherwise]
 QT6_INSTALL_LIBEXECDIR ?= "${libexecdir}"
-QT6_INSTALL_LIBEXECDIR_mingw32 ?= "${bindir}"
+QT6_INSTALL_LIBEXECDIR:mingw32 ?= "${bindir}"
 # QML2 imports [ARCHDATADIR/qml]
 QT6_INSTALL_QMLDIR ?= "${libdir}/qml"
 # "Arch-independent data [PREFIX]

classes/qt6-qmake.bbclass

@@ -13,7 +13,7 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
 OE_QMAKE_PATH_EXAMPLES = "${QT6_INSTALL_EXAMPLESDIR}"
 OE_QMAKE_PATH_TESTS = "${QT6_INSTALL_TESTSDIR}"
 OE_QMAKE_PATH_HOST_PREFIX = ""
-OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}"
+OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}"
 OE_QMAKE_PATH_HOST_BINS = "${QT6_INSTALL_BINDIR}"
 OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
 OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"
@@ -25,13 +25,13 @@ QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
 QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}"
 
 QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
-QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
-QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
+QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
+QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
 
-DEPENDS_prepend = "qtbase-native "
+DEPENDS:prepend = "qtbase-native "
 
 # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
-XPLATFORM_toolchain-clang = "linux-oe-clang"
+XPLATFORM:toolchain-clang = "linux-oe-clang"
 XPLATFORM ?= "linux-oe-g++"
 
 OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}"
@@ -239,7 +239,7 @@ do_configure () {
     ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD"
 }
 
-do_install_class-native() {
+do_install:class-native() {
     oe_runmake install INSTALL_ROOT=${D}
     find "${D}" -ignore_readdir_race -name "*.la" -delete
     if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then

coin/module_config.yaml

@@ -132,7 +132,7 @@ instructions:
       bitbake-layers add-layer ${SOURCE_DIR}
 
       if [ -n "${DISABLE_X11}" ] ; then
-        echo "DISTRO_FEATURES_remove = \"x11\"" >> conf/local.conf
+        echo "DISTRO_FEATURES:remove = \"x11\"" >> conf/local.conf
       fi
       if [ -n "${MINGW}" ]; then
         export SDKMACHINE=x86_64-mingw32

coin/test-configs.inc

@@ -1,13 +1,13 @@
 PREFERRED_PROVIDER_udev = "systemd"
 # use gold
-DISTRO_FEATURES_append = " ld-is-gold"
+DISTRO_FEATURES:append = " ld-is-gold"
 # use systemd
-DISTRO_FEATURES_append = " systemd"
+DISTRO_FEATURES:append = " systemd"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
 # use wayland
-DISTRO_FEATURES_append = " wayland"
+DISTRO_FEATURES:append = " wayland"
 
 INHERIT += "buildstats buildstats-summary"
 INHERIT += "rm_work"
@@ -15,7 +15,7 @@ INHERIT += "rm_work"
 # fast compression of SDK tar package
 SDK_XZ_COMPRESSION_LEVEL = "-1"
 
-SDK_ARCHIVE_TYPE_sdkmingw32 = "zip"
+SDK_ARCHIVE_TYPE:sdkmingw32 = "zip"
 
 # be more strict with QA warnings, turn them all to errors:
 EXTRA_QA = "\
@@ -26,51 +26,51 @@ EXTRA_QA = "\
     unknown-configure-option symlink-to-sysroot multilib \
     invalid-packageconfig host-user-contaminated uppercase-pn \
 "
-ERROR_QA_append = "${EXTRA_QA}"
-WARN_QA_remove = "${EXTRA_QA}"
+ERROR_QA:append = "${EXTRA_QA}"
+WARN_QA:remove = "${EXTRA_QA}"
 
 # enable thumb for broader test coverage (oe-core autobuilder doesn't have thumb enabled)
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
-PACKAGECONFIG_append_pn-qtbase = "\
+PACKAGECONFIG:append:pn-qtbase = "\
     tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 "
 
 # imageformats mng FIXME
-PACKAGECONFIG_append_pn-qtimageformats = " jasper"
+PACKAGECONFIG:append:pn-qtimageformats = " jasper"
 
 # enable examples for all Qt modules
-PACKAGECONFIG_append_pn-qt3d = " examples"
-PACKAGECONFIG_append_pn-qt5compat = " examples"
-PACKAGECONFIG_append_pn-qtbase = " examples"
-PACKAGECONFIG_append_pn-qtcharts = " examples"
-PACKAGECONFIG_append_pn-qtcoap = " examples"
-PACKAGECONFIG_append_pn-qtconnectivity = " examples"
-PACKAGECONFIG_append_pn-qtdatavis3d = " examples"
-PACKAGECONFIG_append_pn-qtdeclarative = " examples"
-PACKAGECONFIG_append_pn-qtimageformats = " examples"
-PACKAGECONFIG_append_pn-qtmqtt = " examples"
-PACKAGECONFIG_append_pn-qtmultimedia = " examples"
-PACKAGECONFIG_append_pn-qtnetworkauth = " examples"
-PACKAGECONFIG_append_pn-qtopcua = " examples"
-PACKAGECONFIG_append_pn-qtpositioning = " examples"
-PACKAGECONFIG_append_pn-qtquick3d = " examples"
-PACKAGECONFIG_append_pn-qtquickdesigner-components = " examples"
-PACKAGECONFIG_append_pn-qtquicktimeline = " examples"
-PACKAGECONFIG_append_pn-qtremoteobjects = " examples"
-PACKAGECONFIG_append_pn-qtscxml = " examples"
-PACKAGECONFIG_append_pn-qtsensors = " examples"
-PACKAGECONFIG_append_pn-qtserialbus = " examples"
-PACKAGECONFIG_append_pn-qtserialport = " examples"
-PACKAGECONFIG_append_pn-qtshadertools = " examples"
-PACKAGECONFIG_append_pn-qtspeech = " examples"
-PACKAGECONFIG_append_pn-qtsvg = " examples"
-PACKAGECONFIG_append_pn-qttools = " examples"
-PACKAGECONFIG_append_pn-qttranslations = " examples"
-PACKAGECONFIG_append_pn-qtvirtualkeyboard = " examples"
-PACKAGECONFIG_append_pn-qtwayland = " examples"
-PACKAGECONFIG_append_pn-qtwebchannel = " examples"
-PACKAGECONFIG_append_pn-qtwebsockets = " examples"
+PACKAGECONFIG:append:pn-qt3d = " examples"
+PACKAGECONFIG:append:pn-qt5compat = " examples"
+PACKAGECONFIG:append:pn-qtbase = " examples"
+PACKAGECONFIG:append:pn-qtcharts = " examples"
+PACKAGECONFIG:append:pn-qtcoap = " examples"
+PACKAGECONFIG:append:pn-qtconnectivity = " examples"
+PACKAGECONFIG:append:pn-qtdatavis3d = " examples"
+PACKAGECONFIG:append:pn-qtdeclarative = " examples"
+PACKAGECONFIG:append:pn-qtimageformats = " examples"
+PACKAGECONFIG:append:pn-qtmqtt = " examples"
+PACKAGECONFIG:append:pn-qtmultimedia = " examples"
+PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
+PACKAGECONFIG:append:pn-qtopcua = " examples"
+PACKAGECONFIG:append:pn-qtpositioning = " examples"
+PACKAGECONFIG:append:pn-qtquick3d = " examples"
+PACKAGECONFIG:append:pn-qtquickdesigner-components = " examples"
+PACKAGECONFIG:append:pn-qtquicktimeline = " examples"
+PACKAGECONFIG:append:pn-qtremoteobjects = " examples"
+PACKAGECONFIG:append:pn-qtscxml = " examples"
+PACKAGECONFIG:append:pn-qtsensors = " examples"
+PACKAGECONFIG:append:pn-qtserialbus = " examples"
+PACKAGECONFIG:append:pn-qtserialport = " examples"
+PACKAGECONFIG:append:pn-qtshadertools = " examples"
+PACKAGECONFIG:append:pn-qtspeech = " examples"
+PACKAGECONFIG:append:pn-qtsvg = " examples"
+PACKAGECONFIG:append:pn-qttools = " examples"
+PACKAGECONFIG:append:pn-qttranslations = " examples"
+PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples"
+PACKAGECONFIG:append:pn-qtwayland = " examples"
+PACKAGECONFIG:append:pn-qtwebchannel = " examples"
+PACKAGECONFIG:append:pn-qtwebsockets = " examples"

coin/test-dunfell.inc

@@ -1,2 +1,2 @@
 # disable examples for qtbase (QTBUG-96197)
-PACKAGECONFIG_remove_pn-qtbase = "examples"
+PACKAGECONFIG:remove:pn-qtbase = "examples"

coin/test-hardknott.inc

@@ -1,3 +1,3 @@
-DISTRO_FEATURES_append = " webengine"
+DISTRO_FEATURES:append = " webengine"
 LICENSE_FLAGS_WHITELIST = "commercial"
-PACKAGECONFIG_append_pn-qtwebengine = " examples proprietary-codecs ffmpeg"
+PACKAGECONFIG:append:pn-qtwebengine = " examples proprietary-codecs ffmpeg"

recipes-qt/meta/meta-toolchain-qt6.bb

@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 inherit populate_sdk populate_sdk_qt6_base
 
-TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt6-toolchain-host"
-TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt6-modules"
+TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt6-toolchain-host"
+TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt6-modules"

recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb

@@ -5,7 +5,7 @@ inherit packagegroup nativesdk
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     nativesdk-make \
     nativesdk-cmake \
     nativesdk-ninja \
@@ -27,7 +27,7 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \
 "
 
-RDEPENDS_${PN}_remove_mingw32 = " \
+RDEPENDS:${PN}:remove:mingw32 = " \
     nativesdk-cmake \
     nativesdk-ninja \
     nativesdk-perl-modules \

recipes-qt/packagegroups/packagegroup-qt6-addons.bb

@@ -7,7 +7,7 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
     qt5compat \
     qtcharts \

recipes-qt/packagegroups/packagegroup-qt6-essentials.bb

@@ -7,7 +7,7 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtbase \
     qtdeclarative \
     qttools \

recipes-qt/packagegroups/packagegroup-qt6-modules.bb

@@ -7,7 +7,7 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     packagegroup-qt6-essentials \
     packagegroup-qt6-addons \
 "

recipes-qt/qt6/chromium-gn.inc

@@ -4,12 +4,12 @@ inherit linuxloader
 inherit qemu
 
 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_aarch64 = "(.*)"
-COMPATIBLE_MACHINE_armv6 = "(.*)"
-COMPATIBLE_MACHINE_armv7a = "(.*)"
-COMPATIBLE_MACHINE_armv7ve = "(.*)"
-COMPATIBLE_MACHINE_x86 = "(.*)"
-COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE:aarch64 = "(.*)"
+COMPATIBLE_MACHINE:armv6 = "(.*)"
+COMPATIBLE_MACHINE:armv7a = "(.*)"
+COMPATIBLE_MACHINE:armv7ve = "(.*)"
+COMPATIBLE_MACHINE:x86 = "(.*)"
+COMPATIBLE_MACHINE:x86-64 = "(.*)"
 
 # By default, passing is_official_build=true to GN causes its symbol_level
 # variable to be set to "2". This means the compiler will be passed "-g2" and
@@ -25,24 +25,24 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
 #    instead, so that if DEBUG_BUILD is not set GN will not create a huge debug
 #    binary anyway. Since our compiler flags are passed after GN's, -g0 does
 #    not cause any issues if DEBUG_BUILD is set, as -g1 will be passed later.
-DEBUG_FLAGS_remove_arm = "-g"
-DEBUG_FLAGS_append_arm = "-g1"
-DEBUG_FLAGS_remove_x86 = "-g"
-DEBUG_FLAGS_append_x86 = "-g1"
+DEBUG_FLAGS:remove:arm = "-g"
+DEBUG_FLAGS:append:arm = "-g1"
+DEBUG_FLAGS:remove:x86 = "-g"
+DEBUG_FLAGS:append:x86 = "-g1"
 
 # As of Chromium 62.0.3202.94 and Yocto Rocko (GCC 7, binutils 2.29), passing
 # -g to the compiler results in many linker errors on aarch64, such as:
 # obj/third_party/WebKit/Source/modules/payments/libpayments.a(PaymentEventDataConversion.o)(.debug_loc+0x4e25): error: relocation overflow in R_AARCH64_ABS32
-DEBUG_FLAGS_remove_aarch64 = "-g"
-DEBUG_FLAGS_append_aarch64 = "-g1"
+DEBUG_FLAGS:remove:aarch64 = "-g"
+DEBUG_FLAGS:append:aarch64 = "-g1"
 
 # As of Chromium 60.0.3112.101 and Yocto Pyro (GCC 6, binutils 2.28), passing
 # -g to the compiler results in many linker errors on x86_64, such as:
 # obj/third_party/WebKit/Source/core/loader/libloader.a(ModuleTreeLinker.o)(.debug_loc+0x1e9a5): error: relocation overflow: reference to local symbol 82 in obj/third_party/WebKit/Source/core/loader/libloader.a(ModuleTreeLinker.o)
 # obj/third_party/WebKit/Source/core/libcore_generated.a(ScriptModule.o)(.debug_loc+0x253c): error: relocation overflow: reference to local symbol 31 in obj/third_party/WebKit/Source/core/libcore_generated.a(ScriptModule.o)
 # so we have to use the same hack described above.
-DEBUG_FLAGS_remove_x86-64 = "-g"
-DEBUG_FLAGS_append_x86-64 = "-g1"
+DEBUG_FLAGS:remove:x86-64 = "-g"
+DEBUG_FLAGS:append:x86-64 = "-g1"
 
 # V8's JIT infrastructure requires binaries such as mksnapshot and
 # mkpeephole to be run in the host during the build. However, these
@@ -77,7 +77,7 @@ python do_create_v8_qemu_wrapper () {
 # This causes the build tools to crash with QEMU when they are ran during
 # to build. Instead of using QEMU, change the wrapper to try to run the
 # tools directly, using the target dynloader.
-python do_create_v8_qemu_wrapper_x86-64 () {
+python do_create_v8_qemu_wrapper:x86-64 () {
     wrapper_path = d.expand('${B}/src/core/Release/${TARGET_ARCH}')
     bb.utils.mkdirhier(wrapper_path)
     wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh")
@@ -110,4 +110,4 @@ do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
 # There is no need to ship empty -dev packages.
-ALLOW_EMPTY_${PN}-dev = "0"
+ALLOW_EMPTY:${PN}-dev = "0"

recipes-qt/qt6/gn-native_git.bb

@@ -8,4 +8,4 @@ cmake_do_install() {
     eval DESTDIR='${D}' ${CMAKE_VERBOSE} cmake --install '${B}'
 }
 
-INSANE_SKIP_${PN} += "already-stripped"
+INSANE_SKIP:${PN} += "already-stripped"

recipes-qt/qt6/gn-utils.inc

@@ -28,10 +28,10 @@ def gn_host_arch_name(d):
 # non-Python variables with overrides that are generic enough (i.e. "x86"
 # instead of "i586") and then use gn_target_arch_name() to return the right
 # value with some validation.
-GN_TARGET_ARCH_NAME_aarch64 = "arm64"
-GN_TARGET_ARCH_NAME_arm = "arm"
-GN_TARGET_ARCH_NAME_x86 = "x86"
-GN_TARGET_ARCH_NAME_x86-64 = "x64"
+GN_TARGET_ARCH_NAME:aarch64 = "arm64"
+GN_TARGET_ARCH_NAME:arm = "arm"
+GN_TARGET_ARCH_NAME:x86 = "x86"
+GN_TARGET_ARCH_NAME:x86-64 = "x64"
 
 def clang_install_path(d):
     """Return clang compiler install path."""

recipes-qt/qt6/qt6-ptest.inc

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/ptest"
+FILESEXTRAPATHS:append := ":${THISDIR}/ptest"
 SRC_URI += "file://run-ptest"
 
 inherit ptest
@@ -50,7 +50,7 @@ fakeroot do_install_ptest() {
     fi
 }
 
-INSANE_SKIP_${PN}-ptest += "file-rdeps"
+INSANE_SKIP:${PN}-ptest += "file-rdeps"
 
 PACKAGESPLITFUNCS =+ "remove_ptest_debug"
 remove_ptest_debug() {

recipes-qt/qt6/qt6.inc

@@ -29,52 +29,52 @@ python __anonymous() {
 
 # Many examples come with libraries installed outside of standard libdir,
 # suppress QA check complaining
-INSANE_SKIP_${PN}-dbg += "libdir"
-INSANE_SKIP_${PN}-examples += "libdir dev-so"
+INSANE_SKIP:${PN}-dbg += "libdir"
+INSANE_SKIP:${PN}-examples += "libdir dev-so"
 
-SYSROOT_DIRS_append_mingw32 = " ${QT6_INSTALL_BINDIR}"
+SYSROOT_DIRS:append:mingw32 = " ${QT6_INSTALL_BINDIR}"
 
 PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"
 
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-plugins = "1"
-ALLOW_EMPTY_${PN}-qmlplugins = "1"
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-plugins = "1"
+ALLOW_EMPTY:${PN}-qmlplugins = "1"
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
     ${PN}-plugins \
     ${PN}-qmlplugins \
 "
-RRECOMMENDS_${PN}_class-native = ""
+RRECOMMENDS:${PN}:class-native = ""
 
-RRECOMMENDS_${PN}-dev += " \
+RRECOMMENDS:${PN}-dev += " \
     ${PN}-staticdev \
 "
 
-FILES_${PN}-qmlplugins = " \
+FILES:${PN}-qmlplugins = " \
     ${QT6_INSTALL_QMLDIR} \
 "
 
-FILES_${PN}-tools = " \
+FILES:${PN}-tools = " \
     ${QT6_INSTALL_BINDIR} \
     ${QT6_INSTALL_LIBEXECDIR} \
 "
 
-FILES_${PN}-plugins = " \
+FILES:${PN}-plugins = " \
     ${QT6_INSTALL_PLUGINSDIR}/*/*${SOLIBSDEV} \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*${SOLIBSDEV} \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*/*${SOLIBSDEV} \
 "
-FILES_${PN}-plugins_mingw32 = " \
+FILES:${PN}-plugins:mingw32 = " \
     ${QT6_INSTALL_PLUGINSDIR}/*/*.dll \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*.dll \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*/*.dll \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${QT6_INSTALL_LIBDIR}/lib*${SOLIBS} \
 "
 
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
     ${QT6_INSTALL_DESCRIPTIONSDIR} \
     ${QT6_INSTALL_DOCDIR} \
     ${QT6_INSTALL_INCLUDEDIR} \
@@ -90,7 +90,7 @@ FILES_${PN}-dev += " \
     ${QT6_INSTALL_QMLDIR}/*/*/*/designer \
 "
 
-FILES_${PN}-staticdev += " \
+FILES:${PN}-staticdev += " \
     ${QT6_INSTALL_LIBDIR}/*.a \
     ${QT6_INSTALL_PLUGINSDIR}/*/*.a \
     ${QT6_INSTALL_PLUGINSDIR}/*/*.prl \
@@ -112,7 +112,7 @@ FILES_${PN}-staticdev += " \
 "
 
 # Note: INSTALL_EXAMPLESDIR is not used
-FILES_${PN}-examples = " \
+FILES:${PN}-examples = " \
     ${QT6_INSTALL_EXAMPLESDIR} \
     ${prefix}/examples \
 "

recipes-qt/qt6/qtbase_git.bb

@@ -23,10 +23,10 @@ DEPENDS += "\
     freetype \
     pcre2 \
 "
-DEPENDS_remove_class-native = "qtbase-native"
+DEPENDS:remove:class-native = "qtbase-native"
 
-PACKAGECONFIG_class-native ?= "gui widgets png dbus no-opengl"
-PACKAGECONFIG_class-nativesdk ?= "gui widgets png dbus no-opengl"
+PACKAGECONFIG:class-native ?= "gui widgets png dbus no-opengl"
+PACKAGECONFIG:class-nativesdk ?= "gui widgets png dbus no-opengl"
 PACKAGECONFIG ?= "\
     ${PACKAGECONFIG_DEFAULT} \
     ${PACKAGECONFIG_GRAPHICS} \
@@ -119,7 +119,7 @@ EXTRA_OECMAKE += "\
     -DQT_EDITION=${QT_EDITION} \
 "
 
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
     -DFEATURE_rpath=OFF \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
     -DQT_AVOID_CMAKE_ARCHIVING_API=ON \
@@ -128,7 +128,7 @@ EXTRA_OECMAKE_append_class-target = "\
 
 SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}"
 
-do_install_append() {
+do_install:append() {
     sed -i ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
         -e '/QT_SOURCE_TREE/,+2d'
 
@@ -140,7 +140,7 @@ do_install_append() {
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/data/mac/objc_namespace.sh
 }
 
-do_install_append_class-nativesdk() {
+do_install:append:class-nativesdk() {
     install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
     cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
 set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "")
@@ -148,7 +148,7 @@ set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "")
 EOF
 }
 
-INSANE_SKIP_${PN}-ptest += "arch"
+INSANE_SKIP:${PN}-ptest += "arch"
 INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so \
     ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt3.elf64.so \

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -6,5 +6,5 @@ include recipes-qt/qt6/qt6.inc
 include recipes-qt/qt6/qt6-git.inc
 
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
-RDEPENDS_${PN} = "connman"
+RDEPENDS:${PN} = "connman"
 

recipes-qt/qt6/qtquick3d_git.bb

@@ -21,7 +21,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DFEATURE_system_assimp=OFF,assimp"
 
-FILES_${PN}-qmlplugins += " \
+FILES:${PN}-qmlplugins += " \
   ${QT6_INSTALL_QMLDIR}/QtQuick3D/Helpers/meshes/*.mesh \
 "
 

recipes-qt/qt6/qttools_git.bb

@@ -19,7 +19,7 @@ SRC_URI += " \
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
 
-FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
+FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
 
 BBCLASSEXTEND = "native nativesdk"
 

recipes-qt/qt6/qttranslations_git.bb

@@ -12,7 +12,7 @@ DEPENDS += "qtbase qttools qttools-native"
 
 PACKAGES = "${PN}"
 PACKAGES_DYNAMIC = "${PN}-*"
-PACKAGESPLITFUNCS_prepend = "split_translation_packages "
+PACKAGESPLITFUNCS:prepend = "split_translation_packages "
 
 python split_translation_packages () {
     do_split_packages(d, d.expand('${QT6_INSTALL_TRANSLATIONSDIR}'),
@@ -22,6 +22,6 @@ python split_translation_packages () {
     # Add dynamic packages to the rrecommends of the main packages
     pn = d.getVar('PN')
     pkgs = oe.utils.packages_filter_out_system(d)
-    d.setVar('RRECOMMENDS_' + pn, ' '.join(pkgs))
+    d.setVar('RRECOMMENDS:' + pn, ' '.join(pkgs))
 }
 

recipes-qt/qt6/qtvirtualkeyboard_git.bb

@@ -110,8 +110,8 @@ PACKAGECONFIG[lang-zh_CN] = "-DFEATURE_vkb_lang_zh_CN=ON,-DFEATURE_vkb_lang_zh_C
 PACKAGECONFIG[lang-zh_TW] = "-DFEATURE_vkb_lang_zh_TW=ON,-DFEATURE_vkb_lang_zh_TW=OFF"
 
 PACKAGES += "${PN}-dictionaries"
-RRECOMMENDS_${PN} += "${PN}-dictionaries"
-FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
+RRECOMMENDS:${PN} += "${PN}-dictionaries"
+FILES:${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
 
 DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
 

recipes-qt/qt6/qtwayland_git.bb

@@ -21,8 +21,8 @@ PACKAGECONFIG ?= "\
     wayland-server \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-glx', '', d)} \
 "
-PACKAGECONFIG_class-native ?= ""
-PACKAGECONFIG_class-nativesdk ?= ""
+PACKAGECONFIG:class-native ?= ""
+PACKAGECONFIG:class-nativesdk ?= ""
 
 PACKAGECONFIG[wayland-client] = "-DFEATURE_wayland_client=ON,-DFEATURE_wayland_client=OFF,"
 PACKAGECONFIG[wayland-server] = "-DFEATURE_wayland_server=ON,-DFEATURE_wayland_server=OFF,"

recipes-qt/qt6/qtwebengine.inc

@@ -30,7 +30,7 @@ def gettext_oeconf(d):
 QT_MODULE = "qtwebengine"
 QT_MODULE_BRANCH_CHROMIUM = "90-based"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/qtwebengine:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 
 SRC_URI += " \
     ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \

recipes-qt/qt6/qtwebengine_git.bb

@@ -78,7 +78,7 @@ PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrt
 PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0"
 PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON,-DFEATURE_webengine_system_zlib=OFF,zlib"
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${QT6_INSTALL_TRANSLATIONSDIR} \
     ${QT6_INSTALL_DATADIR}/resources \
 "