summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 17:05:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2021-08-03 13:38:16 +0200
commita6bee8ea4cb91d0e07d8be272ddc0e56c86e4acf (patch)
tree127f88ca5f4c1f1a0fb80dca719ef817b700ed5b
parent10f3673fd4b6c6e1e61c23478802f83652475a5f (diff)
downloadmeta-qt5-a6bee8ea4cb91d0e07d8be272ddc0e56c86e4acf.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat
-rw-r--r--classes/cmake_qt5.bbclass8
-rw-r--r--classes/populate_sdk_qt5.bbclass4
-rw-r--r--classes/populate_sdk_qt5_base.bbclass2
-rw-r--r--classes/qmake5.bbclass4
-rw-r--r--classes/qmake5_base.bbclass2
-rw-r--r--classes/qmake5_paths.bbclass6
-rw-r--r--recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb4
-rw-r--r--recipes-connectivity/libqofono/libqofono_git.bb8
-rw-r--r--recipes-connectivity/libqofono/libqofonoext_git.bb4
-rw-r--r--recipes-python/pyqt5/python3-pyqt5_5.15.1.bb8
-rw-r--r--recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb10
-rw-r--r--recipes-qt/examples/cinematicexperience_1.0.bb4
-rw-r--r--recipes-qt/examples/qt5everywheredemo_1.0.bb4
-rw-r--r--recipes-qt/examples/qt5ledscreen_1.0.bb4
-rw-r--r--recipes-qt/examples/qt5nmapcarousedemo_1.0.bb4
-rw-r--r--recipes-qt/examples/qt5nmapper_1.0.bb4
-rw-r--r--recipes-qt/examples/qtsmarthome_1.0.bb4
-rw-r--r--recipes-qt/examples/quitbattery_1.0.0.bb4
-rw-r--r--recipes-qt/examples/quitindicators_1.0.1.bb4
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5_git.bb16
-rw-r--r--recipes-qt/maliit/maliit-plugins-qt5_git.bb6
-rw-r--r--recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb2
-rw-r--r--recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb2
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb12
-rw-r--r--recipes-qt/qmllive/qmllive_git.bb2
-rw-r--r--recipes-qt/qsiv/qsiv_1.1.bb6
-rw-r--r--recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb16
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d_git.bb12
-rw-r--r--recipes-qt/qt5/qt5-creator_git.bb24
-rw-r--r--recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb4
-rw-r--r--recipes-qt/qt5/qt5-ptest.inc2
-rw-r--r--recipes-qt/qt5/qt5.inc36
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb4
-rw-r--r--recipes-qt/qt5/qtbase_git.bb32
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb4
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb4
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb6
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb4
-rw-r--r--recipes-qt/qt5/qtscript_git.bb6
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb4
-rw-r--r--recipes-qt/qt5/qttools_git.bb12
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb34
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb6
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb16
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb30
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb32
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb12
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb4
-rw-r--r--recipes-qt/qwt/qwt-qt5_6.1.5.bb24
-rw-r--r--recipes-qt/tufao/tufao_1.3.10.bb6
57 files changed, 245 insertions, 245 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index e380a0ef..6accb819 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -1,12 +1,12 @@
1inherit cmake 1inherit cmake
2inherit qmake5_paths 2inherit qmake5_paths
3 3
4DEPENDS_prepend = "${QTBASEDEPENDS} " 4DEPENDS:prepend = "${QTBASEDEPENDS} "
5QTBASEDEPENDS = "qtbase qtbase-native" 5QTBASEDEPENDS = "qtbase qtbase-native"
6QTBASEDEPENDS_class-native = "qtbase-native" 6QTBASEDEPENDS:class-native = "qtbase-native"
7QTBASEDEPENDS_class-nativesdk = "nativesdk-qtbase qtbase-native" 7QTBASEDEPENDS:class-nativesdk = "nativesdk-qtbase qtbase-native"
8 8
9EXTRA_OECMAKE_prepend = " \ 9EXTRA_OECMAKE:prepend = " \
10 -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ 10 -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \
11 -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ 11 -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \
12 -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ 12 -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index a10341dc..e0b287eb 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -2,7 +2,7 @@
2 2
3inherit populate_sdk_qt5_base 3inherit populate_sdk_qt5_base
4 4
5TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host" 5TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt5-toolchain-host"
6TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target" 6TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt5-toolchain-target"
7 7
8FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" 8FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
diff --git a/classes/populate_sdk_qt5_base.bbclass b/classes/populate_sdk_qt5_base.bbclass
index c26fee44..56341cd1 100644
--- a/classes/populate_sdk_qt5_base.bbclass
+++ b/classes/populate_sdk_qt5_base.bbclass
@@ -1,7 +1,7 @@
1# This allow reuse of Qt paths 1# This allow reuse of Qt paths
2inherit qmake5_paths 2inherit qmake5_paths
3 3
4create_sdk_files_prepend () { 4create_sdk_files:prepend () {
5 # Generate a qt.conf file to be deployed with the SDK 5 # Generate a qt.conf file to be deployed with the SDK
6 qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf 6 qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
7 touch $qtconf 7 touch $qtconf
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
index 1a960e8f..befb5bfd 100644
--- a/classes/qmake5.bbclass
+++ b/classes/qmake5.bbclass
@@ -4,7 +4,7 @@
4inherit qmake5_base 4inherit qmake5_base
5 5
6QT5TOOLSDEPENDS ?= "qtbase-native" 6QT5TOOLSDEPENDS ?= "qtbase-native"
7DEPENDS_prepend = "${QT5TOOLSDEPENDS} " 7DEPENDS:prepend = "${QT5TOOLSDEPENDS} "
8 8
9do_configure() { 9do_configure() {
10 qmake5_base_do_configure 10 qmake5_base_do_configure
@@ -14,6 +14,6 @@ do_install() {
14 qmake5_base_do_install 14 qmake5_base_do_install
15} 15}
16 16
17do_install_class-native() { 17do_install:class-native() {
18 qmake5_base_native_do_install 18 qmake5_base_native_do_install
19} 19}
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 6266c55c..459d2dae 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -1,5 +1,5 @@
1# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds 1# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
2XPLATFORM_toolchain-clang = "linux-oe-clang" 2XPLATFORM:toolchain-clang = "linux-oe-clang"
3XPLATFORM ?= "linux-oe-g++" 3XPLATFORM ?= "linux-oe-g++"
4 4
5OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}" 5OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}"
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass
index ca7e4fc2..abed93b7 100644
--- a/classes/qmake5_paths.bbclass
+++ b/classes/qmake5_paths.bbclass
@@ -9,8 +9,8 @@ QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}"
9QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}" 9QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}"
10 10
11QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" 11QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
12QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" 12QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
13QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" 13QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
14 14
15OE_QMAKE_PATH_PREFIX = "${prefix}" 15OE_QMAKE_PATH_PREFIX = "${prefix}"
16OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}" 16OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}"
@@ -27,7 +27,7 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
27OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" 27OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
28OE_QMAKE_PATH_TESTS = "${datadir}/tests" 28OE_QMAKE_PATH_TESTS = "${datadir}/tests"
29OE_QMAKE_PATH_HOST_PREFIX = "" 29OE_QMAKE_PATH_HOST_PREFIX = ""
30OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}" 30OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}"
31OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" 31OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}"
32OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" 32OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
33OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" 33OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
index bc84224e..fe623eee 100644
--- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
@@ -17,9 +17,9 @@ S = "${WORKDIR}/git"
17 17
18inherit pkgconfig 18inherit pkgconfig
19 19
20RDEPENDS_${PN} += "connman" 20RDEPENDS:${PN} += "connman"
21 21
22do_install_append() { 22do_install:append() {
23 if ls ${D}${libdir}/pkgconfig/connman-qt5.pc >/dev/null 2>/dev/null; then 23 if ls ${D}${libdir}/pkgconfig/connman-qt5.pc >/dev/null 2>/dev/null; then
24 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/connman-qt5.pc 24 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/connman-qt5.pc
25 fi 25 fi
diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb
index 6ed5511c..1d9bb93d 100644
--- a/recipes-connectivity/libqofono/libqofono_git.bb
+++ b/recipes-connectivity/libqofono/libqofono_git.bb
@@ -15,7 +15,7 @@ PV = "0.100+gitr${SRCPV}"
15 15
16inherit qmake5 16inherit qmake5
17 17
18do_install_append() { 18do_install:append() {
19 if ls ${D}${libdir}/pkgconfig/qofono-qt5.pc >/dev/null 2>/dev/null; then 19 if ls ${D}${libdir}/pkgconfig/qofono-qt5.pc >/dev/null 2>/dev/null; then
20 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/qofono-qt5.pc 20 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/qofono-qt5.pc
21 fi 21 fi
@@ -23,17 +23,17 @@ do_install_append() {
23 23
24PACKAGES += "${PN}-tests" 24PACKAGES += "${PN}-tests"
25 25
26FILES_${PN}-tests = " \ 26FILES:${PN}-tests = " \
27 ${libdir}/libqofono-qt5/tests/tst_* \ 27 ${libdir}/libqofono-qt5/tests/tst_* \
28 /opt/examples/libqofono-qt5/ \ 28 /opt/examples/libqofono-qt5/ \
29 /opt/tests/libqofono-qt5 \ 29 /opt/tests/libqofono-qt5 \
30" 30"
31FILES_${PN} += " \ 31FILES:${PN} += " \
32 ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/qmldir \ 32 ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/qmldir \
33 ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/plugins.qmltypes \ 33 ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/plugins.qmltypes \
34 ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/libQOfonoQtDeclarative.so \ 34 ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/libQOfonoQtDeclarative.so \
35" 35"
36FILES_${PN}-dev += " \ 36FILES:${PN}-dev += " \
37 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ 37 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
38 ${libdir}/libqofono-qt5.prl \ 38 ${libdir}/libqofono-qt5.prl \
39 ${datadir}/qt5/mkspecs \ 39 ${datadir}/qt5/mkspecs \
diff --git a/recipes-connectivity/libqofono/libqofonoext_git.bb b/recipes-connectivity/libqofono/libqofonoext_git.bb
index b14aca5f..0c9556a3 100644
--- a/recipes-connectivity/libqofono/libqofonoext_git.bb
+++ b/recipes-connectivity/libqofono/libqofonoext_git.bb
@@ -13,7 +13,7 @@ PV = "1.025+gitr${SRCPV}"
13 13
14inherit qmake5 14inherit qmake5
15 15
16do_install_append() { 16do_install:append() {
17 if ls ${D}${libdir}/pkgconfig/qofono-qt5.pc >/dev/null 2>/dev/null; then 17 if ls ${D}${libdir}/pkgconfig/qofono-qt5.pc >/dev/null 2>/dev/null; then
18 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/qofono-qt5.pc 18 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/qofono-qt5.pc
19 fi 19 fi
@@ -21,7 +21,7 @@ do_install_append() {
21 21
22PACKAGES += "${PN}-tests" 22PACKAGES += "${PN}-tests"
23 23
24FILES_${PN} += " \ 24FILES:${PN} += " \
25 ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/qmldir \ 25 ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/qmldir \
26 ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/plugins.qmltypes \ 26 ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/plugins.qmltypes \
27 ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/libqofonoextdeclarative.so \ 27 ${OE_QMAKE_PATH_QML}/org/nemomobile/ofono/libqofonoextdeclarative.so \
diff --git a/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb b/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb
index 9d8fd39c..2768d5a0 100644
--- a/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb
+++ b/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb
@@ -33,7 +33,7 @@ DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager
33 33
34PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}" 34PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}"
35 35
36do_configure_prepend() { 36do_configure:prepend() {
37 cd ${S} 37 cd ${S}
38 echo "py_platform = linux" > pyqt.cfg 38 echo "py_platform = linux" > pyqt.cfg
39 echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg 39 echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
@@ -61,7 +61,7 @@ do_install() {
61 oe_runmake MAKEFLAGS='-j 1' install 61 oe_runmake MAKEFLAGS='-j 1' install
62} 62}
63 63
64FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" 64FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
65 65
66RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs" 66RDEPENDS:${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs"
67RDEPENDS_${PN} += "python3-core python3-sip3" 67RDEPENDS:${PN} += "python3-core python3-sip3"
diff --git a/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb b/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb
index c6cd2ff6..494caa0c 100644
--- a/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb
+++ b/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb
@@ -31,7 +31,7 @@ PARALLEL_MAKEINST = ""
31 31
32DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" 32DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
33 33
34do_configure_prepend() { 34do_configure:prepend() {
35 cd ${S} 35 cd ${S}
36 echo "[PyQt 5]" > pyqt.cfg 36 echo "[PyQt 5]" > pyqt.cfg
37 echo "py_platform = linux" >> pyqt.cfg 37 echo "py_platform = linux" >> pyqt.cfg
@@ -44,7 +44,7 @@ do_configure_prepend() {
44 echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} 44 echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
45} 45}
46 46
47do_configure_append() { 47do_configure:append() {
48 #Fix installation paths 48 #Fix installation paths
49 sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/Makefile 49 sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/Makefile
50 sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/QtChart/Makefile 50 sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/QtChart/Makefile
@@ -63,7 +63,7 @@ do_install() {
63} 63}
64 64
65 65
66FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/" 66FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/"
67 67
68RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts" 68RDEPENDS:${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts"
69RDEPENDS_${PN} += "python3-core python3-sip3 python3-pyqt5" 69RDEPENDS:${PN} += "python3-core python3-sip3 python3-pyqt5"
diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb
index d7372f61..992f8367 100644
--- a/recipes-qt/examples/cinematicexperience_1.0.bb
+++ b/recipes-qt/examples/cinematicexperience_1.0.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}"
19#S = "${WORKDIR}/Qt5_CinematicExperience_${PV}/" 19#S = "${WORKDIR}/Qt5_CinematicExperience_${PV}/"
20 20
21DEPENDS = "qtdeclarative qtgraphicaleffects" 21DEPENDS = "qtdeclarative qtgraphicaleffects"
22RDEPENDS_${PN} = "liberation-fonts qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 22RDEPENDS:${PN} = "liberation-fonts qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
23 23
24require recipes-qt/qt5/qt5.inc 24require recipes-qt/qt5/qt5.inc
25 25
@@ -37,4 +37,4 @@ do_install() {
37 chmod +x ${D}${bindir}/Qt5_CinematicExperience 37 chmod +x ${D}${bindir}/Qt5_CinematicExperience
38} 38}
39 39
40FILES_${PN} += "${datadir}" 40FILES:${PN} += "${datadir}"
diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb
index 44e5a84f..9e074abc 100644
--- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
+++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
@@ -20,6 +20,6 @@ do_install() {
20 cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} 20 cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P}
21} 21}
22 22
23FILES_${PN} += "${datadir}" 23FILES:${PN} += "${datadir}"
24 24
25RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 25RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
diff --git a/recipes-qt/examples/qt5ledscreen_1.0.bb b/recipes-qt/examples/qt5ledscreen_1.0.bb
index e221941f..395d3d1b 100644
--- a/recipes-qt/examples/qt5ledscreen_1.0.bb
+++ b/recipes-qt/examples/qt5ledscreen_1.0.bb
@@ -18,6 +18,6 @@ do_install() {
18 cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${P} 18 cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${P}
19} 19}
20 20
21FILES_${PN} += "${datadir}" 21FILES:${PN} += "${datadir}"
22 22
23RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 23RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
diff --git a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
index 54875f97..fad6c4bc 100644
--- a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
+++ b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
@@ -21,6 +21,6 @@ do_install() {
21 cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} 21 cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P}
22} 22}
23 23
24FILES_${PN} += "${datadir}" 24FILES:${PN} += "${datadir}"
25 25
26RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 26RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
diff --git a/recipes-qt/examples/qt5nmapper_1.0.bb b/recipes-qt/examples/qt5nmapper_1.0.bb
index 3c2bc1a9..10324cee 100644
--- a/recipes-qt/examples/qt5nmapper_1.0.bb
+++ b/recipes-qt/examples/qt5nmapper_1.0.bb
@@ -22,7 +22,7 @@ do_install() {
22 cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} 22 cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P}
23} 23}
24 24
25FILES_${PN} += "${datadir}" 25FILES:${PN} += "${datadir}"
26 26
27RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 27RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
28 28
diff --git a/recipes-qt/examples/qtsmarthome_1.0.bb b/recipes-qt/examples/qtsmarthome_1.0.bb
index 03f3c994..e858a618 100644
--- a/recipes-qt/examples/qtsmarthome_1.0.bb
+++ b/recipes-qt/examples/qtsmarthome_1.0.bb
@@ -22,6 +22,6 @@ do_install() {
22 cp -R --no-dereference --preserve=mode,links ${S}/components ${D}${datadir}/${P} 22 cp -R --no-dereference --preserve=mode,links ${S}/components ${D}${datadir}/${P}
23} 23}
24 24
25FILES_${PN} += "${datadir}" 25FILES:${PN} += "${datadir}"
26 26
27RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 27RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
diff --git a/recipes-qt/examples/quitbattery_1.0.0.bb b/recipes-qt/examples/quitbattery_1.0.0.bb
index 7593ab29..c8dddb17 100644
--- a/recipes-qt/examples/quitbattery_1.0.0.bb
+++ b/recipes-qt/examples/quitbattery_1.0.0.bb
@@ -20,6 +20,6 @@ do_install() {
20 cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} 20 cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P}
21} 21}
22 22
23FILES_${PN} += "${datadir}" 23FILES:${PN} += "${datadir}"
24 24
25RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 25RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
diff --git a/recipes-qt/examples/quitindicators_1.0.1.bb b/recipes-qt/examples/quitindicators_1.0.1.bb
index bc370f44..48b72041 100644
--- a/recipes-qt/examples/quitindicators_1.0.1.bb
+++ b/recipes-qt/examples/quitindicators_1.0.1.bb
@@ -19,6 +19,6 @@ do_install() {
19 cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} 19 cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P}
20} 20}
21 21
22FILES_${PN} += "${datadir}" 22FILES:${PN} += "${datadir}"
23 23
24RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" 24RDEPENDS:${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index 72e6be5f..67fd1295 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -24,9 +24,9 @@ GTKIMMODULES_PACKAGES = "${PN}-gtk"
24 24
25DEPENDS = "qtdeclarative" 25DEPENDS = "qtdeclarative"
26 26
27RRECOMMENDS_${PN} = "maliit-plugins-qt5" 27RRECOMMENDS:${PN} = "maliit-plugins-qt5"
28 28
29FILES_${PN} += "\ 29FILES:${PN} += "\
30 ${libdir}/*.so* \ 30 ${libdir}/*.so* \
31 ${bindir} \ 31 ${bindir} \
32 ${datadir}/applications/maliit-server.desktop \ 32 ${datadir}/applications/maliit-server.desktop \
@@ -34,11 +34,11 @@ FILES_${PN} += "\
34 ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \ 34 ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \
35" 35"
36 36
37FILES_${PN}-dbg += "\ 37FILES:${PN}-dbg += "\
38 ${libdir}/maliit-framework-tests \ 38 ${libdir}/maliit-framework-tests \
39" 39"
40 40
41FILES_${PN}-dev += "\ 41FILES:${PN}-dev += "\
42 ${includedir}/maliit \ 42 ${includedir}/maliit \
43 ${libdir}/pkgconfig \ 43 ${libdir}/pkgconfig \
44 ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ 44 ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
@@ -62,11 +62,11 @@ EXTRA_QMAKEVARS_PRE = "\
62" 62"
63 63
64# tests fail to build with clang 64# tests fail to build with clang
65EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests" 65EXTRA_QMAKEVARS_PRE:append:toolchain-clang = " CONFIG+=notests"
66 66
67EXTRA_OEMAKE += "INSTALL_ROOT=${D}" 67EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
68 68
69do_install_append() { 69do_install:append() {
70 #Fix absolute paths 70 #Fix absolute paths
71 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf 71 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf
72 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf 72 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf
@@ -75,14 +75,14 @@ do_install_append() {
75 install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications 75 install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications
76} 76}
77 77
78pkg_postinst_ontarget_${PN} () { 78pkg_postinst_ontarget:${PN} () {
79#!/bin/sh 79#!/bin/sh
80# should run online 80# should run online
81echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile 81echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile
82ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop 82ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop
83} 83}
84 84
85pkg_postrm_${PN} () { 85pkg_postrm:${PN} () {
86#!/bin/sh 86#!/bin/sh
87# should run online 87# should run online
88if [ "x$D" = "x" ]; then 88if [ "x$D" = "x" ]; then
diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb
index 8464e1f0..d60d4fd7 100644
--- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb
@@ -8,7 +8,7 @@ inherit qmake5
8 8
9DEPENDS = "maliit-framework-qt5" 9DEPENDS = "maliit-framework-qt5"
10 10
11RDEPENDS_${PN} += "qtsvg-plugins" 11RDEPENDS:${PN} += "qtsvg-plugins"
12 12
13SRC_URI = "git://github.com/maliit/plugins.git;branch=master \ 13SRC_URI = "git://github.com/maliit/plugins.git;branch=master \
14 file://0001-Do-not-use-tr1-namespace.patch \ 14 file://0001-Do-not-use-tr1-namespace.patch \
@@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_PRE = "\
26" 26"
27 27
28# tests fail to build with clang 28# tests fail to build with clang
29EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests" 29EXTRA_QMAKEVARS_PRE:append:toolchain-clang = " CONFIG+=notests"
30 30
31FILES_${PN} += "\ 31FILES:${PN} += "\
32 ${libdir}/maliit \ 32 ${libdir}/maliit \
33 ${datadir} \ 33 ${datadir} \
34" 34"
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
index 3a4d25ac..36d56fd5 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
@@ -7,7 +7,7 @@ inherit packagegroup nativesdk
7 7
8PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" 8PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
9 9
10RDEPENDS_${PN} += " \ 10RDEPENDS:${PN} += " \
11 nativesdk-packagegroup-sdk-host \ 11 nativesdk-packagegroup-sdk-host \
12 nativesdk-qttools-tools \ 12 nativesdk-qttools-tools \
13 nativesdk-qtbase \ 13 nativesdk-qtbase \
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb b/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb
index 5894955c..67c4ef21 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb
@@ -8,7 +8,7 @@ inherit packagegroup
8# Override by distro if needed 8# Override by distro if needed
9VIRTUAL-RUNTIME_qtcreator-debug-ssh-daemon ?= "openssh-sshd" 9VIRTUAL-RUNTIME_qtcreator-debug-ssh-daemon ?= "openssh-sshd"
10 10
11RDEPENDS_${PN} = " \ 11RDEPENDS:${PN} = " \
12 gdbserver \ 12 gdbserver \
13 ${VIRTUAL-RUNTIME_qtcreator-debug-ssh-daemon} \ 13 ${VIRTUAL-RUNTIME_qtcreator-debug-ssh-daemon} \
14 openssh-sftp-server \ 14 openssh-sftp-server \
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 8c8bed30..35f14fd3 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -22,7 +22,7 @@ USE_X11 = " \
22 qtx11extras-mkspecs \ 22 qtx11extras-mkspecs \
23" 23"
24 24
25RDEPENDS_${PN} += " \ 25RDEPENDS:${PN} += " \
26 packagegroup-core-standalone-sdk-target \ 26 packagegroup-core-standalone-sdk-target \
27 libsqlite3-dev \ 27 libsqlite3-dev \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
@@ -100,13 +100,13 @@ RDEPENDS_${PN} += " \
100 qtquickcontrols2-dev \ 100 qtquickcontrols2-dev \
101 qtquickcontrols2-mkspecs \ 101 qtquickcontrols2-mkspecs \
102" 102"
103RDEPENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools" 103RDEPENDS:${PN}:remove:toolchain-clang:riscv32 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools"
104RDEPENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools" 104RDEPENDS:${PN}:remove:toolchain-clang:riscv64 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools"
105 105
106RRECOMMENDS_${PN} += " \ 106RRECOMMENDS:${PN} += " \
107 qtquickcontrols-qmlplugins \ 107 qtquickcontrols-qmlplugins \
108 qttools-plugins \ 108 qttools-plugins \
109" 109"
110 110
111RRECOMMENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-plugins" 111RRECOMMENDS:${PN}:remove:toolchain-clang:riscv32 = "qttools-plugins"
112RRECOMMENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-plugins" 112RRECOMMENDS:${PN}:remove:toolchain-clang:riscv64 = "qttools-plugins"
diff --git a/recipes-qt/qmllive/qmllive_git.bb b/recipes-qt/qmllive/qmllive_git.bb
index 8a4a6ce7..906ed3e5 100644
--- a/recipes-qt/qmllive/qmllive_git.bb
+++ b/recipes-qt/qmllive/qmllive_git.bb
@@ -18,4 +18,4 @@ inherit pkgconfig qmake5
18EXTRA_QMAKEVARS_PRE += "LIB_ARCH=${@d.getVar('baselib').replace('lib', '')}" 18EXTRA_QMAKEVARS_PRE += "LIB_ARCH=${@d.getVar('baselib').replace('lib', '')}"
19EXTRA_QMAKEVARS_POST = "QMAKE_RPATHDIR=" 19EXTRA_QMAKEVARS_POST = "QMAKE_RPATHDIR="
20 20
21FILES_${PN}-dev += "${datadir}" 21FILES:${PN}-dev += "${datadir}"
diff --git a/recipes-qt/qsiv/qsiv_1.1.bb b/recipes-qt/qsiv/qsiv_1.1.bb
index 5773c3e7..050c910c 100644
--- a/recipes-qt/qsiv/qsiv_1.1.bb
+++ b/recipes-qt/qsiv/qsiv_1.1.bb
@@ -13,7 +13,7 @@ inherit qmake5
13 13
14EXTRA_QMAKEVARS_PRE += "target.path=${libdir}/${P}" 14EXTRA_QMAKEVARS_PRE += "target.path=${libdir}/${P}"
15 15
16do_install_append() { 16do_install:append() {
17 install -d ${D}${bindir} 17 install -d ${D}${bindir}
18 echo "#!/bin/sh" > ${D}${bindir}/qsiv 18 echo "#!/bin/sh" > ${D}${bindir}/qsiv
19 echo "export QML_IMPORT_PATH=${libdir}/${P}/qml/qsiv" >> ${D}${bindir}/qsiv 19 echo "export QML_IMPORT_PATH=${libdir}/${P}/qml/qsiv" >> ${D}${bindir}/qsiv
@@ -22,5 +22,5 @@ do_install_append() {
22 chmod +x ${D}${bindir}/qsiv 22 chmod +x ${D}${bindir}/qsiv
23} 23}
24 24
25FILES_${PN} += "${libdir}/${P}" 25FILES:${PN} += "${libdir}/${P}"
26RDEPENDS_${PN} += "qtdeclarative-qmlplugins" 26RDEPENDS:${PN} += "qtdeclarative-qmlplugins"
diff --git a/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb b/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb
index 8ae0e9ef..8c8348c2 100644
--- a/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb
+++ b/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb
@@ -23,11 +23,11 @@ inherit qmake5
23 23
24EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" 24EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
25 25
26do_install_append() { 26do_install:append() {
27 install -Dm 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/${PN}.conf 27 install -Dm 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/${PN}.conf
28} 28}
29 29
30RDEPENDS_${PN} += " \ 30RDEPENDS:${PN} += " \
31 liberation-fonts \ 31 liberation-fonts \
32 qtdeclarative-qmlplugins \ 32 qtdeclarative-qmlplugins \
33 qtquickcontrols-qmlplugins \ 33 qtquickcontrols-qmlplugins \
@@ -35,9 +35,9 @@ RDEPENDS_${PN} += " \
35 qtwebengine-qmlplugins \ 35 qtwebengine-qmlplugins \
36" 36"
37COMPATIBLE_MACHINE = "(-)" 37COMPATIBLE_MACHINE = "(-)"
38COMPATIBLE_MACHINE_x86 = "(.*)" 38COMPATIBLE_MACHINE:x86 = "(.*)"
39COMPATIBLE_MACHINE_x86-64 = "(.*)" 39COMPATIBLE_MACHINE:x86-64 = "(.*)"
40COMPATIBLE_MACHINE_armv6 = "(.*)" 40COMPATIBLE_MACHINE:armv6 = "(.*)"
41COMPATIBLE_MACHINE_armv7a = "(.*)" 41COMPATIBLE_MACHINE:armv7a = "(.*)"
42COMPATIBLE_MACHINE_armv7ve = "(.*)" 42COMPATIBLE_MACHINE:armv7ve = "(.*)"
43COMPATIBLE_MACHINE_aarch64 = "(.*)" 43COMPATIBLE_MACHINE:aarch64 = "(.*)"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 594173aa..62ed20c9 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -61,12 +61,12 @@ SRC_URI += " \
61 61
62PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" 62PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
63 63
64FILES_${PN}-dev += " \ 64FILES:${PN}-dev += " \
65 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ 65 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
66 ${OE_QMAKE_PATH_LIBS}/*.prl \ 66 ${OE_QMAKE_PATH_LIBS}/*.prl \
67" 67"
68 68
69FILES_${PN} += " \ 69FILES:${PN} += " \
70 ${SDKPATHNATIVE}/environment-setup.d \ 70 ${SDKPATHNATIVE}/environment-setup.d \
71 ${OE_QMAKE_PATH_PLUGINS} \ 71 ${OE_QMAKE_PATH_PLUGINS} \
72 ${OE_QMAKE_PATH_LIBS}/metatypes \ 72 ${OE_QMAKE_PATH_LIBS}/metatypes \
@@ -76,7 +76,7 @@ FILES_${PN} += " \
76# collisions with qt4. This would trigger debian.bbclass to rename the 76# collisions with qt4. This would trigger debian.bbclass to rename the
77# package, since it doesn't detect binaries in subdirs. Explicitly 77# package, since it doesn't detect binaries in subdirs. Explicitly
78# disable package auto-renaming for the tools-package. 78# disable package auto-renaming for the tools-package.
79DEBIAN_NOAUTONAME_${PN} = "1" 79DEBIAN_NOAUTONAME:${PN} = "1"
80 80
81PACKAGECONFIG ?= "" 81PACKAGECONFIG ?= ""
82PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui," 82PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui,"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 53f4e484..1128c40d 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -9,19 +9,19 @@ LIC_FILES_CHKSUM = " \
9" 9"
10 10
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
12DEPENDS_class-target += "qtdeclarative qt3d-native" 12DEPENDS:class-target += "qtdeclarative qt3d-native"
13 13
14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.15 14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.15
15# 5.15.meta-qt5.2 15# 5.15.meta-qt5.2
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18" 18"
19SRC_URI_append_riscv64 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch" 19SRC_URI:append:riscv64 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch"
20SRC_URI_append_riscv32 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch" 20SRC_URI:append:riscv32 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch"
21 21
22PACKAGECONFIG ??= "" 22PACKAGECONFIG ??= ""
23PACKAGECONFIG_class-native ??= "tools-only" 23PACKAGECONFIG:class-native ??= "tools-only"
24PACKAGECONFIG_class-nativesdk ??= "tools-only" 24PACKAGECONFIG:class-nativesdk ??= "tools-only"
25PACKAGECONFIG[tools-only] = "" 25PACKAGECONFIG[tools-only] = ""
26PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp" 26PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp"
27PACKAGECONFIG[qtgamepad] = ",,qtgamepad" 27PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
@@ -31,7 +31,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}"
33 33
34do_configure_prepend() { 34do_configure:prepend() {
35 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG 35 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG
36 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \ 36 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \
37 ${S}/src/input/frontend/frontend.pri \ 37 ${S}/src/input/frontend/frontend.pri \
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb
index a83dab23..518100ed 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \
15inherit qmake5 mime-xdg 15inherit qmake5 mime-xdg
16 16
17DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" 17DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib"
18DEPENDS_append_libc-musl = " libexecinfo" 18DEPENDS:append:libc-musl = " libexecinfo"
19 19
20SRCREV = "94d227cd434d09717de95529e5210ec530451e1c" 20SRCREV = "94d227cd434d09717de95529e5210ec530451e1c"
21PV = "4.15.2+git${SRCPV}" 21PV = "4.15.2+git${SRCPV}"
@@ -27,7 +27,7 @@ SRC_URI = " \
27 file://0002-clangformat-Fix-build-with-LLVM-13.patch \ 27 file://0002-clangformat-Fix-build-with-LLVM-13.patch \
28 file://0003-clangformat-Fix-build-with-LLVM-13.patch \ 28 file://0003-clangformat-Fix-build-with-LLVM-13.patch \
29" 29"
30SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" 30SRC_URI:append:libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch"
31 31
32S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
33 33
@@ -39,16 +39,16 @@ EXTRA_QMAKEVARS_PRE += " \
39EXTRANATIVEPATH += "chrpath-native" 39EXTRANATIVEPATH += "chrpath-native"
40 40
41PACKAGECONFIG ??= "" 41PACKAGECONFIG ??= ""
42PACKAGECONFIG_append_toolchain-clang = " clang" 42PACKAGECONFIG:append:toolchain-clang = " clang"
43 43
44# Important note: In case clang was added to qttools' PACKAGECONFIG, it has to 44# Important note: In case clang was added to qttools' PACKAGECONFIG, it has to
45# be added here too - otherwise build fails trying to link native clang libraries 45# be added here too - otherwise build fails trying to link native clang libraries
46PACKAGECONFIG[clang] = ",,clang" 46PACKAGECONFIG[clang] = ",,clang"
47 47
48COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" 48COMPATIBLE_HOST:toolchain-clang:riscv32 = "null"
49COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" 49COMPATIBLE_HOST:toolchain-clang:riscv64 = "null"
50 50
51do_configure_append() { 51do_configure:append() {
52 # Find native tools 52 # Find native tools
53 sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile 53 sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
54 if [ -e ${B}/share/qtcreator/translations/Makefile ]; then 54 if [ -e ${B}/share/qtcreator/translations/Makefile ]; then
@@ -68,22 +68,22 @@ do_install() {
68 fi 68 fi
69} 69}
70 70
71FILES_${PN} += " \ 71FILES:${PN} += " \
72 ${datadir}/qtcreator \ 72 ${datadir}/qtcreator \
73 ${datadir}/metainfo \ 73 ${datadir}/metainfo \
74 ${datadir}/icons \ 74 ${datadir}/icons \
75 ${libdir}${QT_DIR_NAME}/qtcreator \ 75 ${libdir}${QT_DIR_NAME}/qtcreator \
76" 76"
77 77
78FILES_${PN}-dev += " \ 78FILES:${PN}-dev += " \
79 ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ 79 ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \
80" 80"
81 81
82RDEPENDS_${PN} += "perl python3" 82RDEPENDS:${PN} += "perl python3"
83RCONFLICTS_${PN} = "qt-creator" 83RCONFLICTS:${PN} = "qt-creator"
84 84
85# To give best user experience out of the box.. 85# To give best user experience out of the box..
86RRECOMMENDS_${PN} += " \ 86RRECOMMENDS:${PN} += " \
87 packagegroup-qt5-toolchain-target \ 87 packagegroup-qt5-toolchain-target \
88 binutils \ 88 binutils \
89 ccache \ 89 ccache \
@@ -98,7 +98,7 @@ RRECOMMENDS_${PN} += " \
98" 98"
99 99
100# ERROR: qt5-creator-4.5.1-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/libqbscore.so.1.10.1' 100# ERROR: qt5-creator-4.5.1-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/libqbscore.so.1.10.1'
101INSANE_SKIP_${PN} += "ldflags" 101INSANE_SKIP:${PN} += "ldflags"
102 102
103inherit features_check 103inherit features_check
104REQUIRED_DISTRO_FEATURES ?= "x11 opengl" 104REQUIRED_DISTRO_FEATURES ?= "x11 opengl"
diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
index 4e83c267..87f51181 100644
--- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
+++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
@@ -25,6 +25,6 @@ S = "${WORKDIR}/git/vboxtouch"
25 25
26inherit qmake5 26inherit qmake5
27 27
28FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" 28FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so"
29FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*" 29FILES:${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*"
30 30
diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc
index f41e971a..c96714a4 100644
--- a/recipes-qt/qt5/qt5-ptest.inc
+++ b/recipes-qt/qt5/qt5-ptest.inc
@@ -1,4 +1,4 @@
1FILESEXTRAPATHS_append := ":${THISDIR}/ptest" 1FILESEXTRAPATHS:append := ":${THISDIR}/ptest"
2SRC_URI += "file://run-ptest" 2SRC_URI += "file://run-ptest"
3 3
4inherit ptest 4inherit ptest
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 94bbca39..8a54337d 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -47,36 +47,36 @@ python __anonymous() {
47 47
48# Many examples come with libraries installed outside of standard libdir, 48# Many examples come with libraries installed outside of standard libdir,
49# suppress QA check complaining 49# suppress QA check complaining
50INSANE_SKIP_${PN}-dbg += "libdir" 50INSANE_SKIP:${PN}-dbg += "libdir"
51INSANE_SKIP_${PN}-examples += "libdir staticdev dev-so" 51INSANE_SKIP:${PN}-examples += "libdir staticdev dev-so"
52 52
53PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples " 53PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples "
54 54
55ALLOW_EMPTY_${PN} = "1" 55ALLOW_EMPTY:${PN} = "1"
56ALLOW_EMPTY_${PN}-plugins = "1" 56ALLOW_EMPTY:${PN}-plugins = "1"
57ALLOW_EMPTY_${PN}-qmlplugins = "1" 57ALLOW_EMPTY:${PN}-qmlplugins = "1"
58 58
59RRECOMMENDS_${PN} = " \ 59RRECOMMENDS:${PN} = " \
60 ${PN}-plugins \ 60 ${PN}-plugins \
61 ${PN}-qmlplugins \ 61 ${PN}-qmlplugins \
62 " 62 "
63RRECOMMENDS_${PN}_class-native = "" 63RRECOMMENDS:${PN}:class-native = ""
64 64
65RRECOMMENDS_${PN}-dev = " \ 65RRECOMMENDS:${PN}-dev = " \
66 ${PN} \ 66 ${PN} \
67 ${PN}-mkspecs \ 67 ${PN}-mkspecs \
68 ${PN}-qmldesigner \ 68 ${PN}-qmldesigner \
69 " 69 "
70 70
71# extra packages 71# extra packages
72FILES_${PN}-qmldesigner += " \ 72FILES:${PN}-qmldesigner += " \
73 ${OE_QMAKE_PATH_QML}/*/designer \ 73 ${OE_QMAKE_PATH_QML}/*/designer \
74 ${OE_QMAKE_PATH_QML}/*/*/designer \ 74 ${OE_QMAKE_PATH_QML}/*/*/designer \
75 ${OE_QMAKE_PATH_QML}/*/*/*/designer \ 75 ${OE_QMAKE_PATH_QML}/*/*/*/designer \
76" 76"
77 77
78# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc} 78# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc}
79FILES_${PN}-qmlplugins = " \ 79FILES:${PN}-qmlplugins = " \
80 ${OE_QMAKE_PATH_QML}/*.qmltypes \ 80 ${OE_QMAKE_PATH_QML}/*.qmltypes \
81 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ 81 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
82 ${OE_QMAKE_PATH_QML}/*/qmldir \ 82 ${OE_QMAKE_PATH_QML}/*/qmldir \
@@ -114,25 +114,25 @@ FILES_${PN}-qmlplugins = " \
114 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ 114 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \
115" 115"
116 116
117FILES_${PN}-tools = " \ 117FILES:${PN}-tools = " \
118 ${OE_QMAKE_PATH_BINS}/* \ 118 ${OE_QMAKE_PATH_BINS}/* \
119" 119"
120FILES_${PN}-plugins = " \ 120FILES:${PN}-plugins = " \
121 ${OE_QMAKE_PATH_PLUGINS}/*/*${SOLIBSDEV} \ 121 ${OE_QMAKE_PATH_PLUGINS}/*/*${SOLIBSDEV} \
122 ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \ 122 ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \
123 ${OE_QMAKE_PATH_PLUGINS}/*/*/*/*${SOLIBSDEV} \ 123 ${OE_QMAKE_PATH_PLUGINS}/*/*/*/*${SOLIBSDEV} \
124" 124"
125FILES_${PN}-mkspecs = "\ 125FILES:${PN}-mkspecs = "\
126 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ 126 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
127" 127"
128 128
129# modifications to normal packages 129# modifications to normal packages
130FILES_${PN} += " \ 130FILES:${PN} += " \
131 ${OE_QMAKE_PATH_LIBS}/metatypes \ 131 ${OE_QMAKE_PATH_LIBS}/metatypes \
132 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBS} \ 132 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBS} \
133 ${OE_QMAKE_PATH_LIBEXECS} \ 133 ${OE_QMAKE_PATH_LIBEXECS} \
134" 134"
135FILES_${PN}-dev += " \ 135FILES:${PN}-dev += " \
136 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ 136 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
137 ${OE_QMAKE_PATH_LIBS}/pkgconfig \ 137 ${OE_QMAKE_PATH_LIBS}/pkgconfig \
138 ${OE_QMAKE_PATH_LIBS}/cmake/* \ 138 ${OE_QMAKE_PATH_LIBS}/cmake/* \
@@ -140,7 +140,7 @@ FILES_${PN}-dev += " \
140 ${OE_QMAKE_PATH_LIBS}/*.la \ 140 ${OE_QMAKE_PATH_LIBS}/*.la \
141 ${OE_QMAKE_PATH_HEADERS}/* \ 141 ${OE_QMAKE_PATH_HEADERS}/* \
142" 142"
143FILES_${PN}-staticdev += " \ 143FILES:${PN}-staticdev += " \
144 ${OE_QMAKE_PATH_LIBS}/*.a \ 144 ${OE_QMAKE_PATH_LIBS}/*.a \
145 ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ 145 ${OE_QMAKE_PATH_PLUGINS}/*/*.a \
146 ${OE_QMAKE_PATH_PLUGINS}/*/*.prl \ 146 ${OE_QMAKE_PATH_PLUGINS}/*/*.prl \
@@ -155,8 +155,8 @@ FILES_${PN}-staticdev += " \
155 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ 155 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \
156 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ 156 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \
157" 157"
158FILES_${PN}-examples = " \ 158FILES:${PN}-examples = " \
159 ${OE_QMAKE_PATH_EXAMPLES} \ 159 ${OE_QMAKE_PATH_EXAMPLES} \
160" 160"
161 161
162PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" 162PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index d210e222..b4ab09cb 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -56,7 +56,7 @@ SRC_URI += " \
56 56
57CLEANBROKEN = "1" 57CLEANBROKEN = "1"
58 58
59XPLATFORM_toolchain-clang = "linux-oe-clang" 59XPLATFORM:toolchain-clang = "linux-oe-clang"
60XPLATFORM ?= "linux-oe-g++" 60XPLATFORM ?= "linux-oe-g++"
61 61
62PACKAGECONFIG ?= "" 62PACKAGECONFIG ?= ""
@@ -109,7 +109,7 @@ QT_CONFIG_FLAGS = " \
109# since we cannot set empty set filename to a not existent file 109# since we cannot set empty set filename to a not existent file
110deltask generate_qt_config_file 110deltask generate_qt_config_file
111 111
112do_configure_prepend() { 112do_configure:prepend() {
113 # Regenerate header files when they are included in source tarball 113 # Regenerate header files when they are included in source tarball
114 # Otherwise cmake files don't set PRIVATE_HEADERS correctly 114 # Otherwise cmake files don't set PRIVATE_HEADERS correctly
115 rm -rf ${S}/include 115 rm -rf ${S}/include
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index e845dfe0..310aa761 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -42,7 +42,7 @@ SRC_URI += "\
42LTO = "" 42LTO = ""
43 43
44# for syncqt 44# for syncqt
45RDEPENDS_${PN}-tools += "perl" 45RDEPENDS:${PN}-tools += "perl"
46 46
47# separate some parts of PACKAGECONFIG which are often changed 47# separate some parts of PACKAGECONFIG which are often changed
48PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}" 48PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}"
@@ -165,8 +165,8 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-
165# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=bfd -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread 165# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=bfd -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread
166# 166#
167# http://errors.yoctoproject.org/Errors/Details/150329/ 167# http://errors.yoctoproject.org/Errors/Details/150329/
168# QT_CONFIG_FLAGS_GOLD_x86 = "-no-use-gold-linker" 168# QT_CONFIG_FLAGS_GOLD:x86 = "-no-use-gold-linker"
169# LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 169# LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
170 170
171# since the upgrade to 5.12.2 this got worse, with gold enabled configure will no longer pass the test for xlib 171# since the upgrade to 5.12.2 this got worse, with gold enabled configure will no longer pass the test for xlib
172# because with full paths to libraries since qtbase commit 521a85395 it fails to link with 172# because with full paths to libraries since qtbase commit 521a85395 it fails to link with
@@ -176,9 +176,9 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-
176# resulting in do_configure failure: 176# resulting in do_configure failure:
177# http://errors.yoctoproject.org/Errors/Details/237856/ 177# http://errors.yoctoproject.org/Errors/Details/237856/
178QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker" 178QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker"
179LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 179LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
180 180
181LDFLAGS_append_riscv64 = " -pthread" 181LDFLAGS:append:riscv64 = " -pthread"
182 182
183QT_CONFIG_FLAGS += " \ 183QT_CONFIG_FLAGS += " \
184 ${QT_CONFIG_FLAGS_GOLD} \ 184 ${QT_CONFIG_FLAGS_GOLD} \
@@ -189,9 +189,9 @@ QT_CONFIG_FLAGS += " \
189 ${PACKAGECONFIG_CONFARGS} \ 189 ${PACKAGECONFIG_CONFARGS} \
190" 190"
191 191
192export CC_host_toolchain-clang = "clang" 192export CC_host:toolchain-clang = "clang"
193export CXX_host_toolchain-clang = "clang++" 193export CXX_host:toolchain-clang = "clang++"
194export LD_host_toolchain-clang = "clang++" 194export LD_host:toolchain-clang = "clang++"
195export CC_host ?= "gcc" 195export CC_host ?= "gcc"
196export CXX_host ?= "g++" 196export CXX_host ?= "g++"
197export LD_host ?= "g++" 197export LD_host ?= "g++"
@@ -200,13 +200,13 @@ export LD_host ?= "g++"
200# since we cannot set empty set filename to a not existent file 200# since we cannot set empty set filename to a not existent file
201deltask generate_qt_config_file 201deltask generate_qt_config_file
202 202
203XPLATFORM_toolchain-clang = "linux-oe-clang" 203XPLATFORM:toolchain-clang = "linux-oe-clang"
204XPLATFORM ?= "linux-oe-g++" 204XPLATFORM ?= "linux-oe-g++"
205 205
206# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment 206# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment
207# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp 207# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp
208ARM_INSTRUCTION_SET_armv4 = "arm" 208ARM_INSTRUCTION_SET:armv4 = "arm"
209ARM_INSTRUCTION_SET_armv5 = "arm" 209ARM_INSTRUCTION_SET:armv5 = "arm"
210 210
211do_configure() { 211do_configure() {
212 # Regenerate header files when they are included in source tarball 212 # Regenerate header files when they are included in source tarball
@@ -244,7 +244,7 @@ do_configure() {
244 ${QT_CONFIG_FLAGS} 244 ${QT_CONFIG_FLAGS}
245} 245}
246 246
247do_install_append() { 247do_install:append() {
248 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" 248 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
249 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri 249 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri
250 250
@@ -283,21 +283,21 @@ do_install_append() {
283} 283}
284 284
285# mkspecs have mac specific scripts that depend on perl and bash 285# mkspecs have mac specific scripts that depend on perl and bash
286INSANE_SKIP_${PN}-mkspecs += "file-rdeps" 286INSANE_SKIP:${PN}-mkspecs += "file-rdeps"
287 287
288RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 288RRECOMMENDS:${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
289 289
290TARGET_MKSPEC ?= "linux-g++" 290TARGET_MKSPEC ?= "linux-g++"
291 291
292# use clean mkspecs on target 292# use clean mkspecs on target
293pkg_postinst_${PN}-tools () { 293pkg_postinst:${PN}-tools () {
294sed -i \ 294sed -i \
295 -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ 295 -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \
296 -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ 296 -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \
297 $D${OE_QMAKE_PATH_BINS}/qt.conf 297 $D${OE_QMAKE_PATH_BINS}/qt.conf
298} 298}
299 299
300pkg_postinst_${PN}-mkspecs () { 300pkg_postinst:${PN}-mkspecs () {
301sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri 301sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri
302sed -i \ 302sed -i \
303 -e 's: cross_compile : :g' \ 303 -e 's: cross_compile : :g' \
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 1a5238f1..9bd954f2 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -12,6 +12,6 @@ SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
15LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 15LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
16 16
17PACKAGECONFIG ?= "qtquickcompiler" 17PACKAGECONFIG ?= "qtquickcompiler"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 1bbcb57c..6aabde20 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -20,7 +20,7 @@ SRC_URI += " \
20 file://0001-qmldebug-Include-limits-header.patch \ 20 file://0001-qmldebug-Include-limits-header.patch \
21" 21"
22 22
23LDFLAGS_append_riscv64 = " -pthread" 23LDFLAGS:append:riscv64 = " -pthread"
24 24
25DEPENDS += "qtbase qtdeclarative-native" 25DEPENDS += "qtbase qtdeclarative-native"
26 26
@@ -50,7 +50,7 @@ do_install_ptest() {
50 done 50 done
51} 51}
52 52
53do_install_append_class-nativesdk() { 53do_install:append:class-nativesdk() {
54 # qml files not needed in nativesdk 54 # qml files not needed in nativesdk
55 rm -rf ${D}${OE_QMAKE_PATH_QML} 55 rm -rf ${D}${OE_QMAKE_PATH_QML}
56} 56}
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 9657a5ef..eeaddd98 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtdeclarative-native" 13DEPENDS += "qtdeclarative qtdeclarative-native"
14 14
15RDEPENDS_${PN}-dev = "" 15RDEPENDS:${PN}-dev = ""
16 16
17# The same issue as in qtbase: 17# The same issue as in qtbase:
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561" 21SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 89d42813..f7bce75e 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -27,7 +27,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
27 27
28# The same issue as in qtbase: 28# The same issue as in qtbase:
29# http://errors.yoctoproject.org/Errors/Details/152640/ 29# http://errors.yoctoproject.org/Errors/Details/152640/
30LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 30LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
31 31
32QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging" 32QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging"
33 33
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index fdbebd6d..a7cb4e20 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -36,12 +36,12 @@ SRC_URI += "\
36 36
37# The same issue as in qtbase: 37# The same issue as in qtbase:
38# http://errors.yoctoproject.org/Errors/Build/44914/ 38# http://errors.yoctoproject.org/Errors/Build/44914/
39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 39LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
40 40
41SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc" 41SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc"
42 42
43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory 43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
44do_install_append() { 44do_install:append() {
45 install -d ${D}${OE_QMAKE_PATH_PLUGINS}/videoeglvideonode 45 install -d ${D}${OE_QMAKE_PATH_PLUGINS}/videoeglvideonode
46} 46}
47FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/videoeglvideonode" 47FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}/videoeglvideonode"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index a56e26db..f953671b 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -17,7 +17,7 @@ PACKAGECONFIG[system-assimp] = "-system-quick3d-assimp,-qt-quick3d-assimp,assimp
17 17
18EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 18EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
19 19
20FILES_${PN}-qmlplugins += " \ 20FILES:${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22" 22"
23 23
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index c2960096..f251cb8a 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtdeclarative-native" 13DEPENDS += "qtdeclarative qtdeclarative-native"
14 14
15FILES_${PN}-qmlplugins += " \ 15FILES:${PN}-qmlplugins += " \
16 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ 16 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index c9519137..63ef3b17 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -19,8 +19,8 @@ SRC_URI += " \
19" 19"
20 20
21PACKAGECONFIG ??= "" 21PACKAGECONFIG ??= ""
22PACKAGECONFIG_class-native ??= "tools-only" 22PACKAGECONFIG:class-native ??= "tools-only"
23PACKAGECONFIG_class-nativesdk ??= "tools-only" 23PACKAGECONFIG:class-nativesdk ??= "tools-only"
24PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" 24PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 773bc044..e2ed64f3 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,13 +27,13 @@ SRC_URI += " \
27#{standard input}:23: Error: selected processor does not support Thumb mode `stmdb sp!,{r4-r8,lr}' 27#{standard input}:23: Error: selected processor does not support Thumb mode `stmdb sp!,{r4-r8,lr}'
28#{standard input}:30: Error: lo register required -- `ldmia sp!,{r4-r8,lr}' 28#{standard input}:30: Error: lo register required -- `ldmia sp!,{r4-r8,lr}'
29#{standard input}:43: Error: lo register required -- `ldmia sp!,{r4-r8,lr}' 29#{standard input}:43: Error: lo register required -- `ldmia sp!,{r4-r8,lr}'
30ARM_INSTRUCTION_SET_armv4 = "arm" 30ARM_INSTRUCTION_SET:armv4 = "arm"
31ARM_INSTRUCTION_SET_armv5 = "arm" 31ARM_INSTRUCTION_SET:armv5 = "arm"
32 32
33DEPENDS += "qtbase" 33DEPENDS += "qtbase"
34 34
35# The same issue as in qtbase: 35# The same issue as in qtbase:
36# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
38 38
39SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93" 39SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 7a0975bf..ee90701c 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -16,7 +16,7 @@ SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16"
16# 5.15.meta-qt5.1 16# 5.15.meta-qt5.1
17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
18 18
19do_install_append_class-nativesdk() { 19do_install:append:class-nativesdk() {
20 # qml files not needed in nativesdk 20 # qml files not needed in nativesdk
21 rm -rf ${D}${OE_QMAKE_PATH_QML} 21 rm -rf ${D}${OE_QMAKE_PATH_QML}
22} 22}
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 5f5e1ad8..5bef7c13 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -17,12 +17,12 @@ PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,bluez5"
17 17
18EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 18EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
19 19
20do_configure_prepend() { 20do_configure:prepend() {
21 # disable bluez test if it isn't enabled by PACKAGECONFIG 21 # disable bluez test if it isn't enabled by PACKAGECONFIG
22 sed -i 's/^ qtCompileTest(bluez)/ OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtsystems.pro 22 sed -i 's/^ qtCompileTest(bluez)/ OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtsystems.pro
23} 23}
24 24
25do_install_append() { 25do_install:append() {
26 # Remove example.pro file as it is useless 26 # Remove example.pro file as it is useless
27 rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro 27 rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro
28} 28}
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 63566035..8b8270ad 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -19,19 +19,19 @@ SRC_URI += " \
19 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 19 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
20 file://0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch \ 20 file://0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch \
21" 21"
22SRC_URI_append_class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'file://0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch', '', d)}" 22SRC_URI:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'file://0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch', '', d)}"
23 23
24FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" 24FILES:${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks"
25FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" 25FILES:${PN}-examples = "${datadir}${QT_DIR_NAME}/examples"
26 26
27PACKAGECONFIG ??= "" 27PACKAGECONFIG ??= ""
28PACKAGECONFIG_append_toolchain-clang = " clang" 28PACKAGECONFIG:append:toolchain-clang = " clang"
29 29
30PACKAGECONFIG[qtwebkit] = ",,qtwebkit" 30PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31PACKAGECONFIG[clang] = ",,clang" 31PACKAGECONFIG[clang] = ",,clang"
32 32
33COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" 33COMPATIBLE_HOST:toolchain-clang:riscv32 = "null"
34COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" 34COMPATIBLE_HOST:toolchain-clang:riscv64 = "null"
35 35
36export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" 36export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config"
37 37
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index ecc9db2f..6465ed0f 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qttools-native" 9DEPENDS += "qtbase qttools-native"
10 10
11do_install_append() { 11do_install:append() {
12 # remove qtquick1 translations - qtquick1 is gone 12 # remove qtquick1 translations - qtquick1 is gone
13 for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do 13 for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do
14 rm $transfile 14 rm $transfile
@@ -34,67 +34,67 @@ PACKAGES =. " \
34 ${PN}-qthelp \ 34 ${PN}-qthelp \
35" 35"
36 36
37FILES_${PN}-assistant = " \ 37FILES:${PN}-assistant = " \
38 ${OE_QMAKE_PATH_TRANSLATIONS}/assistant_*.qm \ 38 ${OE_QMAKE_PATH_TRANSLATIONS}/assistant_*.qm \
39" 39"
40 40
41FILES_${PN}-designer = " \ 41FILES:${PN}-designer = " \
42 ${OE_QMAKE_PATH_TRANSLATIONS}/designer_*.qm \ 42 ${OE_QMAKE_PATH_TRANSLATIONS}/designer_*.qm \
43" 43"
44 44
45FILES_${PN}-linguist = " \ 45FILES:${PN}-linguist = " \
46 ${OE_QMAKE_PATH_TRANSLATIONS}/linguist_*.qm \ 46 ${OE_QMAKE_PATH_TRANSLATIONS}/linguist_*.qm \
47" 47"
48 48
49FILES_${PN}-qtconnectivity = " \ 49FILES:${PN}-qtconnectivity = " \
50 ${OE_QMAKE_PATH_TRANSLATIONS}/qtconnectivity_*.qm \ 50 ${OE_QMAKE_PATH_TRANSLATIONS}/qtconnectivity_*.qm \
51" 51"
52 52
53FILES_${PN}-qtmultimedia = " \ 53FILES:${PN}-qtmultimedia = " \
54 ${OE_QMAKE_PATH_TRANSLATIONS}/qtmultimedia_*.qm \ 54 ${OE_QMAKE_PATH_TRANSLATIONS}/qtmultimedia_*.qm \
55" 55"
56 56
57FILES_${PN}-qtlocation = " \ 57FILES:${PN}-qtlocation = " \
58 ${OE_QMAKE_PATH_TRANSLATIONS}/qtlocation_*.qm \ 58 ${OE_QMAKE_PATH_TRANSLATIONS}/qtlocation_*.qm \
59" 59"
60 60
61FILES_${PN}-qtdeclarative = " \ 61FILES:${PN}-qtdeclarative = " \
62 ${OE_QMAKE_PATH_TRANSLATIONS}/qtdeclarative_*.qm \ 62 ${OE_QMAKE_PATH_TRANSLATIONS}/qtdeclarative_*.qm \
63" 63"
64 64
65FILES_${PN}-qtquickcontrols = " \ 65FILES:${PN}-qtquickcontrols = " \
66 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols_*.qm \ 66 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols_*.qm \
67" 67"
68 68
69FILES_${PN}-qtquickcontrols2 = " \ 69FILES:${PN}-qtquickcontrols2 = " \
70 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols2_*.qm \ 70 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols2_*.qm \
71" 71"
72 72
73FILES_${PN}-qtwebsockets = " \ 73FILES:${PN}-qtwebsockets = " \
74 ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebsockets_*.qm \ 74 ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebsockets_*.qm \
75" 75"
76 76
77FILES_${PN}-qtwebengine = " \ 77FILES:${PN}-qtwebengine = " \
78 ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \ 78 ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \
79" 79"
80 80
81FILES_${PN}-qtxmlpatterns = " \ 81FILES:${PN}-qtxmlpatterns = " \
82 ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \ 82 ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \
83" 83"
84 84
85FILES_${PN}-qtscript = " \ 85FILES:${PN}-qtscript = " \
86 ${OE_QMAKE_PATH_TRANSLATIONS}/qtscript_*.qm \ 86 ${OE_QMAKE_PATH_TRANSLATIONS}/qtscript_*.qm \
87" 87"
88 88
89FILES_${PN}-qtserialport = " \ 89FILES:${PN}-qtserialport = " \
90 ${OE_QMAKE_PATH_TRANSLATIONS}/qtserialport_*.qm \ 90 ${OE_QMAKE_PATH_TRANSLATIONS}/qtserialport_*.qm \
91" 91"
92 92
93FILES_${PN}-qtbase = " \ 93FILES:${PN}-qtbase = " \
94 ${OE_QMAKE_PATH_TRANSLATIONS}/qtbase_*.qm \ 94 ${OE_QMAKE_PATH_TRANSLATIONS}/qtbase_*.qm \
95" 95"
96 96
97FILES_${PN}-qthelp = " \ 97FILES:${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index c3b8a90f..6a6ffc1e 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -65,9 +65,9 @@ EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
65EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" 65EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"
66 66
67PACKAGES += "${PN}-dictionaries" 67PACKAGES += "${PN}-dictionaries"
68RRECOMMENDS_${PN} += "${PN}-dictionaries" 68RRECOMMENDS:${PN} += "${PN}-dictionaries"
69FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" 69FILES:${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
70FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" 70FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
71 71
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index c74b51b1..6ec156d9 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -2,7 +2,7 @@ require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native" 4DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native"
5DEPENDS_append_class-target = " libxkbcommon" 5DEPENDS:append:class-target = " libxkbcommon"
6 6
7LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 7LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
8LIC_FILES_CHKSUM = " \ 8LIC_FILES_CHKSUM = " \
@@ -24,12 +24,12 @@ PACKAGECONFIG ?= " \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \ 25 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \
26" 26"
27PACKAGECONFIG_class-native ?= "" 27PACKAGECONFIG:class-native ?= ""
28PACKAGECONFIG_class-nativesdk ?= "" 28PACKAGECONFIG:class-nativesdk ?= ""
29QMAKE_PROFILES_class-native = "${S}/src/qtwaylandscanner" 29QMAKE_PROFILES:class-native = "${S}/src/qtwaylandscanner"
30QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner" 30QMAKE_PROFILES:class-nativesdk = "${S}/src/qtwaylandscanner"
31B_class-native = "${SEPB}/src/qtwaylandscanner" 31B:class-native = "${SEPB}/src/qtwaylandscanner"
32B_class-nativesdk = "${SEPB}/src/qtwaylandscanner" 32B:class-nativesdk = "${SEPB}/src/qtwaylandscanner"
33 33
34PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client" 34PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client"
35PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server" 35PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server"
@@ -49,4 +49,4 @@ BBCLASSEXTEND =+ "native nativesdk"
49 49
50# The same issue as in qtbase: 50# The same issue as in qtbase:
51# http://errors.yoctoproject.org/Errors/Details/152641/ 51# http://errors.yoctoproject.org/Errors/Details/152641/
52LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 52LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 789c3de5..fd7b8e36 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -32,7 +32,7 @@ DEPENDS += " \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ 32 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
33" 33"
34 34
35DEPENDS_append_libc-musl = " libexecinfo" 35DEPENDS:append:libc-musl = " libexecinfo"
36 36
37EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn" 37EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn"
38EXTRA_QMAKEVARS_PRE += "CONFIG+=force_debug_info" 38EXTRA_QMAKEVARS_PRE += "CONFIG+=force_debug_info"
@@ -72,12 +72,12 @@ PACKAGECONFIG[pulseaudio] = "-feature-webengine-pulseaudio,-no-feature-webengine
72EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 72EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
73 73
74COMPATIBLE_MACHINE = "(-)" 74COMPATIBLE_MACHINE = "(-)"
75COMPATIBLE_MACHINE_x86 = "(.*)" 75COMPATIBLE_MACHINE:x86 = "(.*)"
76COMPATIBLE_MACHINE_x86-64 = "(.*)" 76COMPATIBLE_MACHINE:x86-64 = "(.*)"
77COMPATIBLE_MACHINE_armv6 = "(.*)" 77COMPATIBLE_MACHINE:armv6 = "(.*)"
78COMPATIBLE_MACHINE_armv7a = "(.*)" 78COMPATIBLE_MACHINE:armv7a = "(.*)"
79COMPATIBLE_MACHINE_armv7ve = "(.*)" 79COMPATIBLE_MACHINE:armv7ve = "(.*)"
80COMPATIBLE_MACHINE_aarch64 = "(.*)" 80COMPATIBLE_MACHINE:aarch64 = "(.*)"
81 81
82inherit qmake5 82inherit qmake5
83inherit gettext 83inherit gettext
@@ -120,7 +120,7 @@ do_configure() {
120 ${EXTRA_QMAKEVARS_CONFIGURE} 120 ${EXTRA_QMAKEVARS_CONFIGURE}
121} 121}
122 122
123do_configure_prepend_libc-musl() { 123do_configure:prepend:libc-musl() {
124 for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do 124 for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do
125 sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f 125 sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f
126 done 126 done
@@ -128,17 +128,17 @@ do_configure_prepend_libc-musl() {
128 128
129do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" 129do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
130 130
131do_install_append() { 131do_install:append() {
132 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc 132 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
133} 133}
134 134
135# for /usr/share/qt5/qtwebengine_resources.pak 135# for /usr/share/qt5/qtwebengine_resources.pak
136FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" 136FILES:${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}"
137 137
138# Chromium uses libpci to determine which optimizations/workarounds to apply 138# Chromium uses libpci to determine which optimizations/workarounds to apply
139RDEPENDS_${PN}_append_x86 = " libpci" 139RDEPENDS:${PN}:append:x86 = " libpci"
140 140
141RDEPENDS_${PN}-examples += " \ 141RDEPENDS:${PN}-examples += " \
142 ${PN}-qmlplugins \ 142 ${PN}-qmlplugins \
143 qtquickcontrols-qmlplugins \ 143 qtquickcontrols-qmlplugins \
144 qtdeclarative-qmlplugins \ 144 qtdeclarative-qmlplugins \
@@ -158,7 +158,7 @@ SRC_URI += " \
158" 158"
159# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 159# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
160# 5.15.meta-qt5.12 160# 5.15.meta-qt5.12
161SRC_URI_append_libc-musl = "\ 161SRC_URI:append:libc-musl = "\
162 file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ 162 file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
163 file://0004-musl-link-against-libexecinfo.patch \ 163 file://0004-musl-link-against-libexecinfo.patch \
164 file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \ 164 file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \
@@ -182,7 +182,7 @@ SRC_URI += " \
182 182
183# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based 183# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based
184# 87-based.meta-qt5.4 184# 87-based.meta-qt5.4
185SRC_URI_append_libc-musl = "\ 185SRC_URI:append:libc-musl = "\
186 file://chromium/0012-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 186 file://chromium/0012-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
187 file://chromium/0013-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 187 file://chromium/0013-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
188 file://chromium/0014-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 188 file://chromium/0014-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
@@ -203,4 +203,4 @@ SRCREV = "${SRCREV_qtwebengine}"
203SRCREV_FORMAT = "qtwebengine_chromium" 203SRCREV_FORMAT = "qtwebengine_chromium"
204 204
205# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel] 205# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel]
206INSANE_SKIP_${PN} += "textrel" 206INSANE_SKIP:${PN} += "textrel"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index fd14851a..0e06d6eb 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -11,7 +11,7 @@ DEPENDS += "qtbase qtwebsockets"
11PACKAGECONFIG ?= "qtdeclarative" 11PACKAGECONFIG ?= "qtdeclarative"
12PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" 12PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
13 13
14do_configure_prepend() { 14do_configure:prepend() {
15 # disable qtdeclarative test if it isn't enabled by PACKAGECONFIG 15 # disable qtdeclarative test if it isn't enabled by PACKAGECONFIG
16 sed -e 's/^\(qtHaveModule(quick)\)/OE_QTDECLARATIVE_ENABLED:\1/' -i ${S}/src/plugins/platforms/webgl/webgl.pro 16 sed -e 's/^\(qtHaveModule(quick)\)/OE_QTDECLARATIVE_ENABLED:\1/' -i ${S}/src/plugins/platforms/webgl/webgl.pro
17} 17}
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index fc9ca922..6ff0eba7 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -23,8 +23,8 @@ SRC_URI += "\
23 file://0009-Riscv-Add-support-for-riscv.patch \ 23 file://0009-Riscv-Add-support-for-riscv.patch \
24" 24"
25 25
26SRC_URI_append_riscv32 = " file://0010-webdriver-libatomic.patch " 26SRC_URI:append:riscv32 = " file://0010-webdriver-libatomic.patch "
27SRC_URI_append_riscv64 = " file://0010-webdriver-libatomic.patch " 27SRC_URI:append:riscv64 = " file://0010-webdriver-libatomic.patch "
28 28
29inherit cmake_qt5 perlnative 29inherit cmake_qt5 perlnative
30 30
@@ -34,16 +34,16 @@ inherit python3native
34# | {standard input}: Assembler messages: 34# | {standard input}: Assembler messages:
35# | {standard input}:106: Error: invalid immediate: 983040 is out of range 35# | {standard input}:106: Error: invalid immediate: 983040 is out of range
36# | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146 36# | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146
37ARM_INSTRUCTION_SET_armv4 = "arm" 37ARM_INSTRUCTION_SET:armv4 = "arm"
38ARM_INSTRUCTION_SET_armv5 = "arm" 38ARM_INSTRUCTION_SET:armv5 = "arm"
39 39
40# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 40# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474
41# https://bugs.webkit.org/show_bug.cgi?id=159880 41# https://bugs.webkit.org/show_bug.cgi?id=159880
42# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. 42# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime.
43# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). 43# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb).
44ARM_INSTRUCTION_SET_armv7a = "thumb" 44ARM_INSTRUCTION_SET:armv7a = "thumb"
45ARM_INSTRUCTION_SET_armv7r = "thumb" 45ARM_INSTRUCTION_SET:armv7r = "thumb"
46ARM_INSTRUCTION_SET_armv7ve = "thumb" 46ARM_INSTRUCTION_SET:armv7ve = "thumb"
47 47
48# http://errors.yoctoproject.org/Errors/Details/179245/ 48# http://errors.yoctoproject.org/Errors/Details/179245/
49# just use -fpermissive in this case like fedora did: 49# just use -fpermissive in this case like fedora did:
@@ -59,20 +59,20 @@ EXTRA_OECMAKE += " \
59 -DPYTHON_EXECUTABLE=`which python3` \ 59 -DPYTHON_EXECUTABLE=`which python3` \
60" 60"
61 61
62EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" 62EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'"
63 63
64# JIT not supported on MIPS/PPC/RISCV 64# JIT not supported on MIPS/PPC/RISCV
65EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " 65EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON "
66EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " 66EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON "
67EXTRA_OECMAKE_append_powerpc64le = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " 67EXTRA_OECMAKE:append:powerpc64le = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON "
68EXTRA_OECMAKE_append_riscv64 = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " 68EXTRA_OECMAKE:append:riscv64 = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON "
69 69
70# Disable gold on mips64/clang 70# Disable gold on mips64/clang
71# mips64-yoe-linux-musl-ld.gold: internal error in get_got_page_offset, at ../../gold/mips.cc:6260 71# mips64-yoe-linux-musl-ld.gold: internal error in get_got_page_offset, at ../../gold/mips.cc:6260
72# mips-yoe-linux-musl-ld.gold: error: Can't find matching LO16 reloc 72# mips-yoe-linux-musl-ld.gold: error: Can't find matching LO16 reloc
73EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " 73EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF "
74EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " 74EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF "
75EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF " 75EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF "
76 76
77PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ 77PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \
78 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ 78 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
@@ -92,7 +92,7 @@ PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF,
92PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" 92PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen"
93 93
94# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe 94# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe
95PACKAGES_remove = "${PN}-examples" 95PACKAGES:remove = "${PN}-examples"
96 96
97QT_MODULE_BRANCH = "5.212" 97QT_MODULE_BRANCH = "5.212"
98 98
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index fcabec7a..ee140340 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -12,12 +12,12 @@ require qt5-git.inc
12DEPENDS += "qtbase qtwebengine" 12DEPENDS += "qtbase qtwebengine"
13 13
14COMPATIBLE_MACHINE = "(-)" 14COMPATIBLE_MACHINE = "(-)"
15COMPATIBLE_MACHINE_x86 = "(.*)" 15COMPATIBLE_MACHINE:x86 = "(.*)"
16COMPATIBLE_MACHINE_x86-64 = "(.*)" 16COMPATIBLE_MACHINE:x86-64 = "(.*)"
17COMPATIBLE_MACHINE_armv6 = "(.*)" 17COMPATIBLE_MACHINE:armv6 = "(.*)"
18COMPATIBLE_MACHINE_armv7a = "(.*)" 18COMPATIBLE_MACHINE:armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE:armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE:aarch64 = "(.*)"
21 21
22python() { 22python() {
23 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): 23 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index f5db658d..bb8efe05 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -15,10 +15,10 @@ LIC_FILES_CHKSUM = " \
15DEPENDS += "qtbase" 15DEPENDS += "qtbase"
16 16
17PACKAGECONFIG ?= "" 17PACKAGECONFIG ?= ""
18PACKAGECONFIG_class-target ?= "qtdeclarative" 18PACKAGECONFIG:class-target ?= "qtdeclarative"
19PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" 19PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
20 20
21do_configure_prepend() { 21do_configure:prepend() {
22 # disable qtdeclarative test if it isn't enabled by PACKAGECONFIG 22 # disable qtdeclarative test if it isn't enabled by PACKAGECONFIG
23 sed -e 's/qtHaveModule(qml)/OE_QTDECLARATIVE_ENABLED/' -i ${S}/src/src.pro 23 sed -e 's/qtHaveModule(qml)/OE_QTDECLARATIVE_ENABLED/' -i ${S}/src/src.pro
24} 24}
diff --git a/recipes-qt/qwt/qwt-qt5_6.1.5.bb b/recipes-qt/qwt/qwt-qt5_6.1.5.bb
index b483af59..31663d1b 100644
--- a/recipes-qt/qwt/qwt-qt5_6.1.5.bb
+++ b/recipes-qt/qwt/qwt-qt5_6.1.5.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
8 8
9DEPENDS = "qtbase qtsvg qttools" 9DEPENDS = "qtbase qtsvg qttools"
10 10
11COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" 11COMPATIBLE_HOST:toolchain-clang:riscv32 = "null"
12COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" 12COMPATIBLE_HOST:toolchain-clang:riscv64 = "null"
13 13
14inherit qmake5 14inherit qmake5
15 15
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_PRE += " \
26 QWT_CONFIG+=QwtExamples \ 26 QWT_CONFIG+=QwtExamples \
27" 27"
28 28
29do_configure_prepend() { 29do_configure:prepend() {
30 sed -i \ 30 sed -i \
31 -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ 31 -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \
32 -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ 32 -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \
@@ -34,7 +34,7 @@ do_configure_prepend() {
34 export QWT_INSTALL_LIBS=${libdir} 34 export QWT_INSTALL_LIBS=${libdir}
35} 35}
36 36
37do_install_append() { 37do_install:append() {
38 # seems out of tree build confuses installation of examples 38 # seems out of tree build confuses installation of examples
39 # so install them manually 39 # so install them manually
40 install -d ${D}${bindir}/ 40 install -d ${D}${bindir}/
@@ -42,13 +42,13 @@ do_install_append() {
42} 42}
43 43
44 44
45PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " 45PACKAGES:prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
46FILES_${PN}-examples = "${bindir}/*" 46FILES:${PN}-examples = "${bindir}/*"
47FILES_${PN}-features = "${prefix}/features" 47FILES:${PN}-features = "${prefix}/features"
48FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" 48FILES:${PN}-plugins = "${prefix}/plugins/designer/*.so"
49FILES_${PN}-doc += "${prefix}/doc" 49FILES:${PN}-doc += "${prefix}/doc"
50 50
51INSANE_SKIP_${PN}-plugins += "libdir" 51INSANE_SKIP:${PN}-plugins += "libdir"
52INSANE_SKIP_${PN}-dbg += "libdir" 52INSANE_SKIP:${PN}-dbg += "libdir"
53 53
54RPROVIDES_${PN}-dev = "libqwt-qt5-dev" 54RPROVIDES:${PN}-dev = "libqwt-qt5-dev"
diff --git a/recipes-qt/tufao/tufao_1.3.10.bb b/recipes-qt/tufao/tufao_1.3.10.bb
index 719269f1..429b0b7d 100644
--- a/recipes-qt/tufao/tufao_1.3.10.bb
+++ b/recipes-qt/tufao/tufao_1.3.10.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x \
10" 10"
11 11
12# This includes bugfixes from 1.x branch 12# This includes bugfixes from 1.x branch
13PV_append = "+${SRCPV}" 13PV:append = "+${SRCPV}"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -18,11 +18,11 @@ inherit cmake_qt5
18 18
19PACKAGES += "${PN}-mkspecs" 19PACKAGES += "${PN}-mkspecs"
20 20
21FILES_${PN}-mkspecs = "\ 21FILES:${PN}-mkspecs = "\
22 ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ 22 ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
23" 23"
24 24
25FILES_${PN}-dev += " \ 25FILES:${PN}-dev += " \
26 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ 26 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
27 ${OE_QMAKE_PATH_LIBS}/pkgconfig \ 27 ${OE_QMAKE_PATH_LIBS}/pkgconfig \
28 ${OE_QMAKE_PATH_LIBS}/cmake/* \ 28 ${OE_QMAKE_PATH_LIBS}/cmake/* \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-14 03:34:51 +0000