summaryrefslogtreecommitdiff
path: root/qt5-layer/recipes-qt
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-08-08 11:11:22 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2021-08-14 13:18:40 +0200
commite7f6f37cdbc8ba971a151ef23d96edd8cda76e30 (patch)
treea506a5dea5e6b3d8e766cf487412c73ec8eeb6df /qt5-layer/recipes-qt
parent05cc0d582c0d3a8a20b02b992589b151b2aad10a (diff)
layer: convert to new override syntaxHEADmaster
This is the result of automated script (0.9.3) conversion: +# meta-toradex-distro +vars = vars + ["preempt-rt","tdx","upstream"] +# meta-toradex-* machines +vars = vars + ["apalis-","colibri-","verdin-","tegra124"] +# meta-freescale +vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"] ../openembedded-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'qt5-layer/recipes-qt')
-rw-r--r--qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend2
-rw-r--r--qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb6
-rw-r--r--qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb2
-rw-r--r--qt5-layer/recipes-qt/qt5/qt3d_%.bbappend8
-rw-r--r--qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb2
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase_%.bbappend16
6 files changed, 18 insertions, 18 deletions
diff --git a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
index 2d005a5..c58fcf2 100644
--- a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
+++ b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN} += "nativesdk-python3-json"
+RDEPENDS:${PN} += "nativesdk-python3-json"
diff --git a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb
index 112a8c0..7c1e563 100644
--- a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb
+++ b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb
@@ -24,10 +24,10 @@ do_configure() {
cmake_do_configure
}
-do_install_append () {
+do_install:append () {
install -d ${D}/${datadir}/applications
install -m 755 ${WORKDIR}/qedit.desktop ${D}/${datadir}/applications/
}
-FILES_${PN} += ""
-FILES_${PN}-dev += ""
+FILES:${PN} += ""
+FILES:${PN}-dev += ""
diff --git a/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
index 32700ad..222e970 100644
--- a/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
+++ b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
qtbase \
qtbase-tools \
qtmultimedia \
diff --git a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
index 85d7eab..0b9a117 100644
--- a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/qt3d:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/qt3d:"
# qt3d links against the opengl flavours we configured qtbase for, so
# depend on them here
DEPENDS_GLES = ""
-DEPENDS_GLES_imxpxp += "virtual/libgles2 virtual/egl"
+DEPENDS_GLES:imxpxp += "virtual/libgles2 virtual/egl"
DEPENDS_GLES_imgpu3d += "virtual/libgles2 virtual/egl"
-DEPENDS_GLES_use-mainline-bsp += "virtual/libgles2 virtual/egl"
+DEPENDS_GLES:use-mainline-bsp += "virtual/libgles2 virtual/egl"
-DEPENDS_class-target += " ${DEPENDS_GLES}"
+DEPENDS:class-target += " ${DEPENDS_GLES}"
# Fix race condition
SRC_URI += "file://0001-qt3d-do-not-set-resources_big.patch"
diff --git a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb
index 6d5963e..81769ff 100644
--- a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb
+++ b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb
@@ -21,4 +21,4 @@ do_install () {
}
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "qt5-x11-demo.service"
+SYSTEMD_SERVICE:${PN} = "qt5-x11-demo.service"
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 2d1f9d6..83eeb1a 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -7,31 +7,31 @@ PACKAGECONFIG_EXAMPLES ?= "examples"
# | /build/krm/oe-core_V2.6/build/out-glibc/work/armv7at2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:74: error: 'QAccessible' has not been declared
# | } else if (QStyleHelper::isInstanceOf(groupBox->styleObject, QAccessible::Grouping)) {
-PACKAGECONFIG_append = " accessibility"
-PACKAGECONFIG_append = " sql-sqlite"
+PACKAGECONFIG:append = " accessibility"
+PACKAGECONFIG:append = " sql-sqlite"
-PACKAGECONFIG_FONTS_append = " fontconfig"
+PACKAGECONFIG_FONTS:append = " fontconfig"
#qtbase must be configured with icu for qtwebkit
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
icu \
${PACKAGECONFIG_EXAMPLES} \
"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
IMX_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
'fb', d), d)}"
-SRC_URI_append = " \
+SRC_URI:append = " \
file://qt5-${IMX_BACKEND}.sh \
"
-do_install_append () {
+do_install:append () {
install -d ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/
}
-FILES_${PN} += "${sysconfdir}/profile.d/qt5*.sh"
+FILES:${PN} += "${sysconfdir}/profile.d/qt5*.sh"