diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index 6315643..ebbe711 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/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 } diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass index acf9484..a7c7438 100644 --- a/classes/qt6-cmake.bbclass +++ b/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' \ diff --git a/classes/qt6-paths.bbclass b/classes/qt6-paths.bbclass index 3f25b0d..7f0005c 100644 --- a/classes/qt6-paths.bbclass +++ b/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] diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass index 5e039e0..02463d1 100644 --- a/classes/qt6-qmake.bbclass +++ b/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 diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 309f2db..4fd78b6 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -129,7 +129,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 diff --git a/coin/test-configs.inc b/coin/test-configs.inc index 0096741..48ba84f 100644 --- a/coin/test-configs.inc +++ b/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,21 +26,21 @@ 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" # Use latest uninative package UNINATIVE_MAXGLIBCVERSION = "2.32" @@ -51,35 +51,35 @@ UNINATIVE_CHECKSUM[i686] ?= "cae5d73245d95b07cf133b780ba3f6c8d0adca3ffc4e7e7fab9 UNINATIVE_CHECKSUM[x86_64] ?= "d07916b95c419c81541a19c8ef0ed8cbd78ae18437ff28a4c8a60ef40518e423" # 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-qtquickcontrols2 = " 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-qtquickcontrols2 = " 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" diff --git a/recipes-qt/meta/meta-toolchain-qt6.bb b/recipes-qt/meta/meta-toolchain-qt6.bb index 6d08aad..50e6345 100644 --- a/recipes-qt/meta/meta-toolchain-qt6.bb +++ b/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" diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb index e598415..944f7cd 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb +++ b/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 \ @@ -25,7 +25,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 \ diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb index 92344e6..15b7694 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb +++ b/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 \ diff --git a/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb b/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb index 447df08..e93537a 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb @@ -7,7 +7,7 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qtbase \ qtdeclarative \ qtquickcontrols2 \ diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb index 7a13043..da1c79e 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb +++ b/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 \ " diff --git a/recipes-qt/qt6/qt6-ptest.inc b/recipes-qt/qt6/qt6-ptest.inc index 1e99c58..403b1f4 100644 --- a/recipes-qt/qt6/qt6-ptest.inc +++ b/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 @@ -49,4 +49,4 @@ fakeroot do_install_ptest() { fi } -INSANE_SKIP_${PN}-ptest += "file-rdeps" +INSANE_SKIP:${PN}-ptest += "file-rdeps" diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc index c9a3193..5322ece 100644 --- a/recipes-qt/qt6/qt6.inc +++ b/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 \ " diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index a98acc1..4d12b84 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -22,10 +22,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} \ @@ -118,7 +118,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 \ @@ -127,7 +127,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' @@ -139,7 +139,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 <