summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/cmake_qt5.bbclass4
-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-python/pyqt5/python-pyqt5.inc10
-rw-r--r--recipes-python/pyqt5/python-pyqt5_5.12.1.bb2
-rw-r--r--recipes-python/pyqt5/python3-pyqt5_5.12.1.bb2
-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.bb4
-rw-r--r--recipes-qt/qmllive/qmllive_git.bb2
-rw-r--r--recipes-qt/qsiv/qsiv_1.1.bb6
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d_git.bb8
-rw-r--r--recipes-qt/qt5/qt5-creator_git.bb22
-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.bb30
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-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.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.bb4
-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.bb18
-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.bb18
-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.4.bb20
-rw-r--r--recipes-qt/tufao/tufao_1.3.10.bb6
55 files changed, 207 insertions, 207 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 5ba960ec..cea8a92e 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -1,9 +1,9 @@
1inherit cmake 1inherit cmake
2inherit qmake5_paths 2inherit qmake5_paths
3 3
4DEPENDS_prepend = "qtbase qtbase-native " 4DEPENDS:prepend = "qtbase qtbase-native "
5 5
6EXTRA_OECMAKE_prepend = " \ 6EXTRA_OECMAKE:prepend = " \
7 -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ 7 -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \
8 -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ 8 -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \
9 -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ 9 -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 4650d597..c142e4b7 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 f9fa27cd..e6219c7e 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 7de0e49b..d1e1f8df 100644
--- a/recipes-connectivity/libqofono/libqofono_git.bb
+++ b/recipes-connectivity/libqofono/libqofono_git.bb
@@ -15,7 +15,7 @@ PV = "0.98+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-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
index 11d246d7..20626bdc 100644
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ b/recipes-python/pyqt5/python-pyqt5.inc
@@ -25,12 +25,12 @@ PARALLEL_MAKEINST = ""
25 25
26DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" 26DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
27 27
28DISABLED_FEATURES_append_arm = " PyQt_qreal_double" 28DISABLED_FEATURES:append:arm = " PyQt_qreal_double"
29 29
30PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" 30PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets"
31PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" 31PYQT_MODULES:aarch64 = "QtCore QtGui QtNetwork QtWidgets"
32 32
33do_configure_prepend() { 33do_configure:prepend() {
34 cd ${S} 34 cd ${S}
35 echo "py_platform = linux" > pyqt.cfg 35 echo "py_platform = linux" > pyqt.cfg
36 echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg 36 echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
@@ -58,6 +58,6 @@ do_install() {
58 oe_runmake MAKEFLAGS='-j 1' install 58 oe_runmake MAKEFLAGS='-j 1' install
59} 59}
60 60
61FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" 61FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
62 62
63RDEPENDS_${PN} = "qtbase" 63RDEPENDS:${PN} = "qtbase"
diff --git a/recipes-python/pyqt5/python-pyqt5_5.12.1.bb b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
index 6b1b5701..74dfee72 100644
--- a/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
+++ b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb
@@ -4,5 +4,5 @@ inherit pythonnative python-dir
4 4
5DEPENDS += "sip sip-native python" 5DEPENDS += "sip sip-native python"
6 6
7RDEPENDS_${PN} += "python-core python-sip" 7RDEPENDS:${PN} += "python-core python-sip"
8 8
diff --git a/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb b/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
index 200a8154..fa830080 100644
--- a/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
+++ b/recipes-python/pyqt5/python3-pyqt5_5.12.1.bb
@@ -4,4 +4,4 @@ inherit python3native python3-dir
4 4
5DEPENDS += "sip3 sip3-native python3" 5DEPENDS += "sip3 sip3-native python3"
6 6
7RDEPENDS_${PN} += "python3-core python3-sip3" 7RDEPENDS:${PN} += "python3-core python3-sip3"
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 4d1d140a..f649617e 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 308f3d02..0f0ed7aa 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -22,9 +22,9 @@ GTKIMMODULES_PACKAGES = "${PN}-gtk"
22 22
23DEPENDS = "qtdeclarative" 23DEPENDS = "qtdeclarative"
24 24
25RRECOMMENDS_${PN} = "maliit-plugins-qt5" 25RRECOMMENDS:${PN} = "maliit-plugins-qt5"
26 26
27FILES_${PN} += "\ 27FILES:${PN} += "\
28 ${libdir}/*.so* \ 28 ${libdir}/*.so* \
29 ${bindir} \ 29 ${bindir} \
30 ${datadir}/applications/maliit-server.desktop \ 30 ${datadir}/applications/maliit-server.desktop \
@@ -32,11 +32,11 @@ FILES_${PN} += "\
32 ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \ 32 ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts \
33" 33"
34 34
35FILES_${PN}-dbg += "\ 35FILES:${PN}-dbg += "\
36 ${libdir}/maliit-framework-tests \ 36 ${libdir}/maliit-framework-tests \
37" 37"
38 38
39FILES_${PN}-dev += "\ 39FILES:${PN}-dev += "\
40 ${includedir}/maliit \ 40 ${includedir}/maliit \
41 ${libdir}/pkgconfig \ 41 ${libdir}/pkgconfig \
42 ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ 42 ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
@@ -60,11 +60,11 @@ EXTRA_QMAKEVARS_PRE = "\
60" 60"
61 61
62# tests fail to build with clang 62# tests fail to build with clang
63EXTRA_QMAKEVARS_PRE_append_toolchain-clang = " CONFIG+=notests" 63EXTRA_QMAKEVARS_PRE:append:toolchain-clang = " CONFIG+=notests"
64 64
65EXTRA_OEMAKE += "INSTALL_ROOT=${D}" 65EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
66 66
67do_install_append() { 67do_install:append() {
68 #Fix absolute paths 68 #Fix absolute paths
69 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf 69 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-framework.prf
70 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf 70 sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/maliit-plugins.prf
@@ -73,7 +73,7 @@ do_install_append() {
73 install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications 73 install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications
74} 74}
75 75
76pkg_postinst_${PN} () { 76pkg_postinst:${PN} () {
77#!/bin/sh 77#!/bin/sh
78# should run online 78# should run online
79if [ "x$D" != "x" ]; then 79if [ "x$D" != "x" ]; then
@@ -83,7 +83,7 @@ echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile
83ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop 83ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop
84} 84}
85 85
86pkg_postrm_${PN} () { 86pkg_postrm:${PN} () {
87#!/bin/sh 87#!/bin/sh
88# should run online 88# should run online
89if [ "x$D" = "x" ]; then 89if [ "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 03e294fd..c7277cae 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 b912d891..94fd59ae 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -26,7 +26,7 @@ USE_X11 = " \
26 qtx11extras-mkspecs \ 26 qtx11extras-mkspecs \
27" 27"
28 28
29RDEPENDS_${PN} += " \ 29RDEPENDS:${PN} += " \
30 packagegroup-core-standalone-sdk-target \ 30 packagegroup-core-standalone-sdk-target \
31 libsqlite3-dev \ 31 libsqlite3-dev \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ 32 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
@@ -109,7 +109,7 @@ RDEPENDS_${PN} += " \
109 qtquickcontrols2-mkspecs \ 109 qtquickcontrols2-mkspecs \
110" 110"
111 111
112RRECOMMENDS_${PN} += " \ 112RRECOMMENDS:${PN} += " \
113 qtquickcontrols-qmlplugins \ 113 qtquickcontrols-qmlplugins \
114 qttools-plugins \ 114 qttools-plugins \
115" 115"
diff --git a/recipes-qt/qmllive/qmllive_git.bb b/recipes-qt/qmllive/qmllive_git.bb
index bc9a3784..4532d193 100644
--- a/recipes-qt/qmllive/qmllive_git.bb
+++ b/recipes-qt/qmllive/qmllive_git.bb
@@ -15,4 +15,4 @@ inherit pkgconfig qmake5
15 15
16EXTRA_QMAKEVARS_POST = "QMAKE_RPATHDIR=" 16EXTRA_QMAKEVARS_POST = "QMAKE_RPATHDIR="
17 17
18FILES_${PN}-dev += "${datadir}" 18FILES:${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/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 8041d80c..72b3cac9 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -60,12 +60,12 @@ SRC_URI += " \
60 60
61PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" 61PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
62 62
63FILES_${PN}-dev += " \ 63FILES:${PN}-dev += " \
64 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ 64 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
65 ${OE_QMAKE_PATH_LIBS}/*.prl \ 65 ${OE_QMAKE_PATH_LIBS}/*.prl \
66" 66"
67 67
68FILES_${PN} += " \ 68FILES:${PN} += " \
69 ${SDKPATHNATIVE}/environment-setup.d \ 69 ${SDKPATHNATIVE}/environment-setup.d \
70" 70"
71 71
@@ -73,7 +73,7 @@ FILES_${PN} += " \
73# collisions with qt4. This would trigger debian.bbclass to rename the 73# collisions with qt4. This would trigger debian.bbclass to rename the
74# package, since it doesn't detect binaries in subdirs. Explicitly 74# package, since it doesn't detect binaries in subdirs. Explicitly
75# disable package auto-renaming for the tools-package. 75# disable package auto-renaming for the tools-package.
76DEBIAN_NOAUTONAME_${PN} = "1" 76DEBIAN_NOAUTONAME:${PN} = "1"
77 77
78QT_CONFIG_FLAGS += " \ 78QT_CONFIG_FLAGS += " \
79 -shared \ 79 -shared \
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 3690b3b0..18a25433 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -9,7 +9,7 @@ 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.12 14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.12
15# 5.12.meta-qt5.2 15# 5.12.meta-qt5.2
@@ -18,8 +18,8 @@ SRC_URI += " \
18" 18"
19 19
20PACKAGECONFIG ??= "" 20PACKAGECONFIG ??= ""
21PACKAGECONFIG_class-native ??= "tools-only" 21PACKAGECONFIG:class-native ??= "tools-only"
22PACKAGECONFIG_class-nativesdk ??= "tools-only" 22PACKAGECONFIG:class-nativesdk ??= "tools-only"
23PACKAGECONFIG[tools-only] = "" 23PACKAGECONFIG[tools-only] = ""
24PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp" 24PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp"
25PACKAGECONFIG[qtgamepad] = ",,qtgamepad" 25PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
@@ -29,7 +29,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}"
31 31
32do_configure_prepend() { 32do_configure:prepend() {
33 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG 33 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG
34 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \ 34 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \
35 ${S}/src/input/frontend/frontend.pri \ 35 ${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 6a8887ed..55a49cea 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = " \
15inherit qmake5 15inherit qmake5
16 16
17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native" 17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native"
18DEPENDS_append_toolchain-clang = " clang llvm-common" 18DEPENDS:append:toolchain-clang = " clang llvm-common"
19DEPENDS_append_libc-musl = " libexecinfo" 19DEPENDS:append:libc-musl = " libexecinfo"
20 20
21SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde" 21SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde"
22PV = "4.7.1+git${SRCPV}" 22PV = "4.7.1+git${SRCPV}"
@@ -28,7 +28,7 @@ SRC_URI = " \
28 file://0002-botan.pro-pass-QMAKE_AR.patch \ 28 file://0002-botan.pro-pass-QMAKE_AR.patch \
29 file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ 29 file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \
30" 30"
31SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" 31SRC_URI:append:libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch"
32 32
33S = "${WORKDIR}/git" 33S = "${WORKDIR}/git"
34 34
@@ -36,7 +36,7 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
36 36
37EXTRANATIVEPATH += "chrpath-native" 37EXTRANATIVEPATH += "chrpath-native"
38 38
39do_configure_append() { 39do_configure:append() {
40 # Find native tools 40 # Find native tools
41 sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile 41 sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
42 if [ -e ${B}/share/qtcreator/translations/Makefile ]; then 42 if [ -e ${B}/share/qtcreator/translations/Makefile ]; then
@@ -50,28 +50,28 @@ do_configure_append() {
50do_install() { 50do_install() {
51 oe_runmake install INSTALL_ROOT=${D}${prefix} 51 oe_runmake install INSTALL_ROOT=${D}${prefix}
52} 52}
53do_install_append_toolchain-clang () { 53do_install:append:toolchain-clang () {
54 # Remove RPATHs embedded in bins 54 # Remove RPATHs embedded in bins
55 chrpath --delete ${D}${libdir}/qtcreator/plugins/libClang* 55 chrpath --delete ${D}${libdir}/qtcreator/plugins/libClang*
56 chrpath --delete ${D}${libexecdir}/qtcreator/clang* 56 chrpath --delete ${D}${libexecdir}/qtcreator/clang*
57} 57}
58 58
59FILES_${PN} += " \ 59FILES:${PN} += " \
60 ${datadir}/qtcreator \ 60 ${datadir}/qtcreator \
61 ${datadir}/metainfo \ 61 ${datadir}/metainfo \
62 ${datadir}/icons \ 62 ${datadir}/icons \
63 ${libdir}${QT_DIR_NAME}/qtcreator \ 63 ${libdir}${QT_DIR_NAME}/qtcreator \
64" 64"
65 65
66FILES_${PN}-dev += " \ 66FILES:${PN}-dev += " \
67 ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ 67 ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \
68" 68"
69 69
70RDEPENDS_${PN} += "perl python" 70RDEPENDS:${PN} += "perl python"
71RCONFLICTS_${PN} = "qt-creator" 71RCONFLICTS:${PN} = "qt-creator"
72 72
73# To give best user experience out of the box.. 73# To give best user experience out of the box..
74RRECOMMENDS_${PN} += " \ 74RRECOMMENDS:${PN} += " \
75 packagegroup-qt5-toolchain-target \ 75 packagegroup-qt5-toolchain-target \
76 binutils \ 76 binutils \
77 ccache \ 77 ccache \
@@ -81,4 +81,4 @@ RRECOMMENDS_${PN} += " \
81" 81"
82 82
83# 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' 83# 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'
84INSANE_SKIP_${PN} += "ldflags" 84INSANE_SKIP:${PN} += "ldflags"
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 56efe106..9ef732dc 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 e0cd8949..c485162e 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,24 +114,24 @@ 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}/lib*${SOLIBS} \ 131 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBS} \
132 ${OE_QMAKE_PATH_LIBEXECS} \ 132 ${OE_QMAKE_PATH_LIBEXECS} \
133" 133"
134FILES_${PN}-dev += " \ 134FILES:${PN}-dev += " \
135 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ 135 ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
136 ${OE_QMAKE_PATH_LIBS}/pkgconfig \ 136 ${OE_QMAKE_PATH_LIBS}/pkgconfig \
137 ${OE_QMAKE_PATH_LIBS}/cmake/* \ 137 ${OE_QMAKE_PATH_LIBS}/cmake/* \
@@ -139,7 +139,7 @@ FILES_${PN}-dev += " \
139 ${OE_QMAKE_PATH_LIBS}/*.la \ 139 ${OE_QMAKE_PATH_LIBS}/*.la \
140 ${OE_QMAKE_PATH_HEADERS}/* \ 140 ${OE_QMAKE_PATH_HEADERS}/* \
141" 141"
142FILES_${PN}-staticdev += " \ 142FILES:${PN}-staticdev += " \
143 ${OE_QMAKE_PATH_LIBS}/*.a \ 143 ${OE_QMAKE_PATH_LIBS}/*.a \
144 ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ 144 ${OE_QMAKE_PATH_PLUGINS}/*/*.a \
145 ${OE_QMAKE_PATH_PLUGINS}/*/*.prl \ 145 ${OE_QMAKE_PATH_PLUGINS}/*/*.prl \
@@ -154,8 +154,8 @@ FILES_${PN}-staticdev += " \
154 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ 154 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \
155 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ 155 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \
156" 156"
157FILES_${PN}-examples = " \ 157FILES:${PN}-examples = " \
158 ${OE_QMAKE_PATH_EXAMPLES} \ 158 ${OE_QMAKE_PATH_EXAMPLES} \
159" 159"
160 160
161PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" 161PATH: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 878a20c2..3b148b50 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -55,7 +55,7 @@ SRC_URI += " \
55 55
56CLEANBROKEN = "1" 56CLEANBROKEN = "1"
57 57
58XPLATFORM_toolchain-clang = "linux-oe-clang" 58XPLATFORM:toolchain-clang = "linux-oe-clang"
59XPLATFORM ?= "linux-oe-g++" 59XPLATFORM ?= "linux-oe-g++"
60 60
61QT_CONFIG_FLAGS = " \ 61QT_CONFIG_FLAGS = " \
@@ -107,7 +107,7 @@ QT_CONFIG_FLAGS = " \
107# since we cannot set empty set filename to a not existent file 107# since we cannot set empty set filename to a not existent file
108deltask generate_qt_config_file 108deltask generate_qt_config_file
109 109
110do_configure_prepend() { 110do_configure:prepend() {
111 # Regenerate header files when they are included in source tarball 111 # Regenerate header files when they are included in source tarball
112 # Otherwise cmake files don't set PRIVATE_HEADERS correctly 112 # Otherwise cmake files don't set PRIVATE_HEADERS correctly
113 rm -rf ${S}/include 113 rm -rf ${S}/include
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 200cb430..76deaedc 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -37,7 +37,7 @@ SRC_URI += "\
37" 37"
38 38
39# for syncqt 39# for syncqt
40RDEPENDS_${PN}-tools += "perl" 40RDEPENDS:${PN}-tools += "perl"
41 41
42# separate some parts of PACKAGECONFIG which are often changed 42# separate some parts of PACKAGECONFIG which are often changed
43PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}" 43PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}"
@@ -159,8 +159,8 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-
159# 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 159# 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
160# 160#
161# http://errors.yoctoproject.org/Errors/Details/150329/ 161# http://errors.yoctoproject.org/Errors/Details/150329/
162# QT_CONFIG_FLAGS_GOLD_x86 = "-no-use-gold-linker" 162# QT_CONFIG_FLAGS_GOLD:x86 = "-no-use-gold-linker"
163# LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 163# LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
164 164
165# since the upgrade to 5.12.2 this got worse, with gold enabled configure will no longer pass the test for xlib 165# since the upgrade to 5.12.2 this got worse, with gold enabled configure will no longer pass the test for xlib
166# because with full paths to libraries since qtbase commit 521a85395 it fails to link with 166# because with full paths to libraries since qtbase commit 521a85395 it fails to link with
@@ -170,7 +170,7 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-
170# resulting in do_configure failure: 170# resulting in do_configure failure:
171# http://errors.yoctoproject.org/Errors/Details/237856/ 171# http://errors.yoctoproject.org/Errors/Details/237856/
172QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker" 172QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker"
173LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 173LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
174 174
175QT_CONFIG_FLAGS += " \ 175QT_CONFIG_FLAGS += " \
176 ${QT_CONFIG_FLAGS_GOLD} \ 176 ${QT_CONFIG_FLAGS_GOLD} \
@@ -182,9 +182,9 @@ QT_CONFIG_FLAGS += " \
182 ${PACKAGECONFIG_CONFARGS} \ 182 ${PACKAGECONFIG_CONFARGS} \
183" 183"
184 184
185export CC_host_toolchain-clang = "clang" 185export CC_host:toolchain-clang = "clang"
186export CXX_host_toolchain-clang = "clang++" 186export CXX_host:toolchain-clang = "clang++"
187export LD_host_toolchain-clang = "clang++" 187export LD_host:toolchain-clang = "clang++"
188export CC_host ?= "gcc" 188export CC_host ?= "gcc"
189export CXX_host ?= "g++" 189export CXX_host ?= "g++"
190export LD_host ?= "g++" 190export LD_host ?= "g++"
@@ -193,13 +193,13 @@ export LD_host ?= "g++"
193# since we cannot set empty set filename to a not existent file 193# since we cannot set empty set filename to a not existent file
194deltask generate_qt_config_file 194deltask generate_qt_config_file
195 195
196XPLATFORM_toolchain-clang = "linux-oe-clang" 196XPLATFORM:toolchain-clang = "linux-oe-clang"
197XPLATFORM ?= "linux-oe-g++" 197XPLATFORM ?= "linux-oe-g++"
198 198
199# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment 199# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment
200# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp 200# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp
201ARM_INSTRUCTION_SET_armv4 = "arm" 201ARM_INSTRUCTION_SET:armv4 = "arm"
202ARM_INSTRUCTION_SET_armv5 = "arm" 202ARM_INSTRUCTION_SET:armv5 = "arm"
203 203
204do_configure() { 204do_configure() {
205 # Regenerate header files when they are included in source tarball 205 # Regenerate header files when they are included in source tarball
@@ -237,7 +237,7 @@ do_configure() {
237 ${QT_CONFIG_FLAGS} 237 ${QT_CONFIG_FLAGS}
238} 238}
239 239
240do_install_append() { 240do_install:append() {
241 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" 241 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
242 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri 242 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri
243 243
@@ -274,21 +274,21 @@ do_install_append() {
274} 274}
275 275
276# mkspecs have mac specific scripts that depend on perl and bash 276# mkspecs have mac specific scripts that depend on perl and bash
277INSANE_SKIP_${PN}-mkspecs += "file-rdeps" 277INSANE_SKIP:${PN}-mkspecs += "file-rdeps"
278 278
279RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 279RRECOMMENDS:${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
280 280
281TARGET_MKSPEC ?= "linux-g++" 281TARGET_MKSPEC ?= "linux-g++"
282 282
283# use clean mkspecs on target 283# use clean mkspecs on target
284pkg_postinst_${PN}-tools () { 284pkg_postinst:${PN}-tools () {
285sed -i \ 285sed -i \
286 -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ 286 -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \
287 -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ 287 -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \
288 $D${OE_QMAKE_PATH_BINS}/qt.conf 288 $D${OE_QMAKE_PATH_BINS}/qt.conf
289} 289}
290 290
291pkg_postinst_${PN}-mkspecs () { 291pkg_postinst:${PN}-mkspecs () {
292sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri 292sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri
293sed -i \ 293sed -i \
294 -e 's: cross_compile : :g' \ 294 -e 's: cross_compile : :g' \
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 50b7e1de..96fdba85 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -12,6 +12,6 @@ SRCREV = "754f8d15a01bae966c43749e3cc833d2def7e808"
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 39a6ab38..8999934e 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -19,7 +19,7 @@ PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
19PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" 19PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network"
20PACKAGECONFIG[static] = ",,qtdeclarative-native" 20PACKAGECONFIG[static] = ",,qtdeclarative-native"
21 21
22do_install_append_class-nativesdk() { 22do_install:append:class-nativesdk() {
23 # qml files not needed in nativesdk 23 # qml files not needed in nativesdk
24 rm -rf ${D}${OE_QMAKE_PATH_QML} 24 rm -rf ${D}${OE_QMAKE_PATH_QML}
25} 25}
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 08762bc0..62d72ffd 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 = "fabaae2f8039d9f12e8531e2dc215b24ffe8d445" 21SRCREV = "fabaae2f8039d9f12e8531e2dc215b24ffe8d445"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 163202ee..1f9a1116 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -28,7 +28,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
28 28
29# The same issue as in qtbase: 29# The same issue as in qtbase:
30# http://errors.yoctoproject.org/Errors/Details/152640/ 30# http://errors.yoctoproject.org/Errors/Details/152640/
31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 31LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
32 32
33QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging" 33QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging"
34 34
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index a6116bae..8422abc6 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,6 +35,6 @@ SRC_URI += "\
35 35
36# The same issue as in qtbase: 36# The same issue as in qtbase:
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e" 40SRCREV = "67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 70e7d820..3ca176e1 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 3d1fcfc4..a2f0c04b 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -18,8 +18,8 @@ SRC_URI += " \
18" 18"
19 19
20PACKAGECONFIG ??= "" 20PACKAGECONFIG ??= ""
21PACKAGECONFIG_class-native ??= "tools-only" 21PACKAGECONFIG:class-native ??= "tools-only"
22PACKAGECONFIG_class-nativesdk ??= "tools-only" 22PACKAGECONFIG:class-nativesdk ??= "tools-only"
23PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" 23PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 5b68392b..3a5dc178 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 = "2ec32b5fdb9671f44e506964ae03109e557dfb99" 39SRCREV = "2ec32b5fdb9671f44e506964ae03109e557dfb99"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index f9793f38..91f5735e 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -16,7 +16,7 @@ SRCREV = "878112bf670bb9f9caa09de290c63b0f9078d3f0"
16# 5.12.meta-qt5.2 16# 5.12.meta-qt5.2
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 f98d13ba..4f993164 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -21,8 +21,8 @@ SRC_URI += " \
21 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 21 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
22" 22"
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[qtwebkit] = ",,qtwebkit" 28PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 93e87c99..db1b2d51 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 883952f9..30d3b7fb 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 a0cda175..4f27ade5 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 = " \
@@ -19,12 +19,12 @@ PACKAGECONFIG ?= " \
19 wayland-egl \ 19 wayland-egl \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
21" 21"
22PACKAGECONFIG_class-native ?= "" 22PACKAGECONFIG:class-native ?= ""
23PACKAGECONFIG_class-nativesdk ?= "" 23PACKAGECONFIG:class-nativesdk ?= ""
24QMAKE_PROFILES_class-native = "${S}/src/qtwaylandscanner" 24QMAKE_PROFILES:class-native = "${S}/src/qtwaylandscanner"
25QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner" 25QMAKE_PROFILES:class-nativesdk = "${S}/src/qtwaylandscanner"
26B_class-native = "${SEPB}/src/qtwaylandscanner" 26B:class-native = "${SEPB}/src/qtwaylandscanner"
27B_class-nativesdk = "${SEPB}/src/qtwaylandscanner" 27B:class-nativesdk = "${SEPB}/src/qtwaylandscanner"
28 28
29PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client" 29PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client"
30PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server" 30PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server"
@@ -43,7 +43,7 @@ BBCLASSEXTEND =+ "native nativesdk"
43 43
44# The same issue as in qtbase: 44# The same issue as in qtbase:
45# http://errors.yoctoproject.org/Errors/Details/152641/ 45# http://errors.yoctoproject.org/Errors/Details/152641/
46LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 46LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
47 47
48# Since version 5.11.2 some private headers are not installed. Work around 48# Since version 5.11.2 some private headers are not installed. Work around
49# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for 49# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for
@@ -51,7 +51,7 @@ LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-
51QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY ?= "1" 51QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY ?= "1"
52# First 6 characters before first + (e.g. 5.11.3-+git) or - (e.g. 5.11.3-2) 52# First 6 characters before first + (e.g. 5.11.3-+git) or - (e.g. 5.11.3-2)
53SHRT_VER ?= "${@d.getVar('PV').split('+')[0].split('-')[0]}" 53SHRT_VER ?= "${@d.getVar('PV').split('+')[0].split('-')[0]}"
54do_install_append() { 54do_install:append() {
55 if [ -d "${B}/src/client" -a "${QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY}" = "1" -a -d "${D}${includedir}/QtWaylandClient/${SHRT_VER}/QtWaylandClient/private/" ]; then 55 if [ -d "${B}/src/client" -a "${QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY}" = "1" -a -d "${D}${includedir}/QtWaylandClient/${SHRT_VER}/QtWaylandClient/private/" ]; then
56 for header in `find ${B}/src/client -name '*wayland-*.h'`; do 56 for header in `find ${B}/src/client -name '*wayland-*.h'`; do
57 header_base=`basename $header` 57 header_base=`basename $header`
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 148bbdbd..f8bebfc5 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -28,7 +28,7 @@ DEPENDS += " \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
29" 29"
30 30
31DEPENDS_append_libc-musl = " libexecinfo" 31DEPENDS:append:libc-musl = " libexecinfo"
32 32
33EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn" 33EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn"
34EXTRA_QMAKEVARS_PRE += "CONFIG+=force_debug_info" 34EXTRA_QMAKEVARS_PRE += "CONFIG+=force_debug_info"
@@ -67,12 +67,12 @@ PACKAGECONFIG[spellchecker] = "-feature-webengine-spellchecker,-no-feature-weben
67EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 67EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
68 68
69COMPATIBLE_MACHINE = "(-)" 69COMPATIBLE_MACHINE = "(-)"
70COMPATIBLE_MACHINE_x86 = "(.*)" 70COMPATIBLE_MACHINE:x86 = "(.*)"
71COMPATIBLE_MACHINE_x86-64 = "(.*)" 71COMPATIBLE_MACHINE:x86-64 = "(.*)"
72COMPATIBLE_MACHINE_armv6 = "(.*)" 72COMPATIBLE_MACHINE:armv6 = "(.*)"
73COMPATIBLE_MACHINE_armv7a = "(.*)" 73COMPATIBLE_MACHINE:armv7a = "(.*)"
74COMPATIBLE_MACHINE_armv7ve = "(.*)" 74COMPATIBLE_MACHINE:armv7ve = "(.*)"
75COMPATIBLE_MACHINE_aarch64 = "(.*)" 75COMPATIBLE_MACHINE:aarch64 = "(.*)"
76 76
77inherit qmake5 77inherit qmake5
78inherit gettext 78inherit gettext
@@ -108,7 +108,7 @@ do_configure() {
108 ${EXTRA_QMAKEVARS_CONFIGURE} 108 ${EXTRA_QMAKEVARS_CONFIGURE}
109} 109}
110 110
111do_configure_prepend_libc-musl() { 111do_configure:prepend:libc-musl() {
112 for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do 112 for f in `find ${S}/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/ -name config.h -o -name config.asm`; do
113 sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f 113 sed -i -e "s:define HAVE_SYSCTL 1:define HAVE_SYSCTL 0:g" $f
114 done 114 done
@@ -116,17 +116,17 @@ do_configure_prepend_libc-musl() {
116 116
117do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" 117do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
118 118
119do_install_append() { 119do_install:append() {
120 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc 120 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
121} 121}
122 122
123# for /usr/share/qt5/qtwebengine_resources.pak 123# for /usr/share/qt5/qtwebengine_resources.pak
124FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" 124FILES:${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}"
125 125
126# Chromium uses libpci to determine which optimizations/workarounds to apply 126# Chromium uses libpci to determine which optimizations/workarounds to apply
127RDEPENDS_${PN}_append_x86 = " libpci" 127RDEPENDS:${PN}:append:x86 = " libpci"
128 128
129RDEPENDS_${PN}-examples += " \ 129RDEPENDS:${PN}-examples += " \
130 ${PN}-qmlplugins \ 130 ${PN}-qmlplugins \
131 qtquickcontrols-qmlplugins \ 131 qtquickcontrols-qmlplugins \
132 qtdeclarative-qmlplugins \ 132 qtdeclarative-qmlplugins \
@@ -140,7 +140,7 @@ SRC_URI += " \
140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
141 file://0001-Force-host-toolchain-configuration.patch \ 141 file://0001-Force-host-toolchain-configuration.patch \
142" 142"
143SRC_URI_append_libc-musl = "\ 143SRC_URI:append:libc-musl = "\
144 file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ 144 file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
145 file://0003-musl-link-against-libexecinfo.patch \ 145 file://0003-musl-link-against-libexecinfo.patch \
146" 146"
@@ -159,7 +159,7 @@ SRC_URI += " \
159 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ 159 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
160" 160"
161 161
162SRC_URI_append_libc-musl = "\ 162SRC_URI:append:libc-musl = "\
163 file://chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 163 file://chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
164 file://chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 164 file://chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
165 file://chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 165 file://chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
@@ -183,4 +183,4 @@ SRCREV = "${SRCREV_qtwebengine}"
183SRCREV_FORMAT = "qtwebengine_chromium" 183SRCREV_FORMAT = "qtwebengine_chromium"
184 184
185# 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] 185# 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]
186INSANE_SKIP_${PN} += "textrel" 186INSANE_SKIP:${PN} += "textrel"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 89ba2d3a..c5a19cba 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 c5473440..28b9f128 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -24,16 +24,16 @@ inherit cmake_qt5 perlnative pythonnative
24# | {standard input}: Assembler messages: 24# | {standard input}: Assembler messages:
25# | {standard input}:106: Error: invalid immediate: 983040 is out of range 25# | {standard input}:106: Error: invalid immediate: 983040 is out of range
26# | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146 26# | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146
27ARM_INSTRUCTION_SET_armv4 = "arm" 27ARM_INSTRUCTION_SET:armv4 = "arm"
28ARM_INSTRUCTION_SET_armv5 = "arm" 28ARM_INSTRUCTION_SET:armv5 = "arm"
29 29
30# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 30# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474
31# https://bugs.webkit.org/show_bug.cgi?id=159880 31# https://bugs.webkit.org/show_bug.cgi?id=159880
32# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. 32# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime.
33# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). 33# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb).
34ARM_INSTRUCTION_SET_armv7a = "thumb" 34ARM_INSTRUCTION_SET:armv7a = "thumb"
35ARM_INSTRUCTION_SET_armv7r = "thumb" 35ARM_INSTRUCTION_SET:armv7r = "thumb"
36ARM_INSTRUCTION_SET_armv7ve = "thumb" 36ARM_INSTRUCTION_SET:armv7ve = "thumb"
37 37
38# http://errors.yoctoproject.org/Errors/Details/179245/ 38# http://errors.yoctoproject.org/Errors/Details/179245/
39# just use -fpermissive in this case like fedora did: 39# just use -fpermissive in this case like fedora did:
@@ -47,11 +47,11 @@ EXTRA_OECMAKE += " \
47 -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ 47 -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
48" 48"
49 49
50EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" 50EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'"
51 51
52# JIT not supported on MIPS64 52# JIT not supported on MIPS64
53EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " 53EXTRA_OECMAKE:append:mips64 = " -DENABLE_JIT=OFF "
54EXTRA_OECMAKE_append_mips64el = " -DENABLE_JIT=OFF " 54EXTRA_OECMAKE:append:mips64el = " -DENABLE_JIT=OFF "
55 55
56PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ 56PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \
57 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ 57 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
@@ -71,7 +71,7 @@ PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF,
71PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" 71PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen"
72 72
73# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe 73# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe
74PACKAGES_remove = "${PN}-examples" 74PACKAGES:remove = "${PN}-examples"
75 75
76QT_MODULE_BRANCH = "dev" 76QT_MODULE_BRANCH = "dev"
77 77
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 1a3f29ab..6fe1a661 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -12,11 +12,11 @@ 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
22SRCREV = "14a616da97106ce08fae58329c211c4688c7fbdf" 22SRCREV = "14a616da97106ce08fae58329c211c4688c7fbdf"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 34d01abc..06c81312 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.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
index d8e1dcd2..4ec188e9 100644
--- a/recipes-qt/qwt/qwt-qt5_6.1.4.bb
+++ b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
@@ -24,7 +24,7 @@ EXTRA_QMAKEVARS_PRE += " \
24 QWT_CONFIG+=QwtExamples \ 24 QWT_CONFIG+=QwtExamples \
25" 25"
26 26
27do_configure_prepend() { 27do_configure:prepend() {
28 sed -i \ 28 sed -i \
29 -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ 29 -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \
30 -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ 30 -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \
@@ -32,7 +32,7 @@ do_configure_prepend() {
32 export QWT_INSTALL_LIBS=${libdir} 32 export QWT_INSTALL_LIBS=${libdir}
33} 33}
34 34
35do_install_append() { 35do_install:append() {
36 # seems out of tree build confuses installation of examples 36 # seems out of tree build confuses installation of examples
37 # so install them manually 37 # so install them manually
38 install -d ${D}${bindir}/ 38 install -d ${D}${bindir}/
@@ -40,13 +40,13 @@ do_install_append() {
40} 40}
41 41
42 42
43PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " 43PACKAGES:prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
44FILES_${PN}-examples = "${bindir}/*" 44FILES:${PN}-examples = "${bindir}/*"
45FILES_${PN}-features = "${prefix}/features" 45FILES:${PN}-features = "${prefix}/features"
46FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" 46FILES:${PN}-plugins = "${prefix}/plugins/designer/*.so"
47FILES_${PN}-doc += "${prefix}/doc" 47FILES:${PN}-doc += "${prefix}/doc"
48 48
49INSANE_SKIP_${PN}-plugins += "libdir" 49INSANE_SKIP:${PN}-plugins += "libdir"
50INSANE_SKIP_${PN}-dbg += "libdir" 50INSANE_SKIP:${PN}-dbg += "libdir"
51 51
52RPROVIDES_${PN}-dev = "libqwt-qt5-dev" 52RPROVIDES:${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-13 15:15:27 +0000