packagegroups, matrix: re-enable qtwebkit for k3
PATCH 1/1 packagegroups, matrix: re-enable qtwebkit for k3
This reverts commit f75e0c1068e18c9ead6f9e39e5cf91800325dbd8.
--- .../recipes-core/packagegroups/packagegroup-arago-qte.bb | 12 ++++++------ .../packagegroups/packagegroup-arago-tisdk-matrix.bb | 8 ++++---- .../packagegroups/packagegroup-arago-tisdk-qte.bb | 12 ++++++------ .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 6 +++--- .../packagegroup-arago-qte-toolchain-target.bb | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +6 -6
@@ -46,12 +46,12 @@ QT5_ESSENTIALS = "\ qtconnectivity-qmlplugins \ " -#QT5_ESSENTIALS_append_k3 = "\ -# qtwebkit-qmlplugins \ -#" -#QT5_ESSENTIALS_remove_k3 = "\ -# qtwebengine-qmlplugins \ -#" +QT5_ESSENTIALS_append_k3 = "\ + qtwebkit-qmlplugins \ +" +QT5_ESSENTIALS_remove_k3 = "\ + qtwebengine-qmlplugins \ +" RDEPENDS_${PN} = "\ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +4 -4
@@ -45,10 +45,10 @@ MATRIX_TOUCH_APPS = " \ MATRIX_QT_APPS_keystone = "" MATRIX_QT_APPS_omapl138 = "" -#MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser" -#MATRIX_QT_APPS_append_k3 = " \ -# matrix-qt5-demo-webkit-browser \ -#" +MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser" +MATRIX_QT_APPS_append_k3 = " \ + matrix-qt5-demo-webkit-browser \ +" MATRIX_SGX_DEMOS = " \ matrix-3d-demo-chameleon \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +6 -6
@@ -28,13 +28,13 @@ QT5_DEMOS = "\ qtserialport-examples \ " -#QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" +QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" -#QT5_DEMOS_remove_k3 = "\ -# qtwebbrowser \ -# qtwebbrowser-examples \ -# qtwebengine-examples \ -#" +QT5_DEMOS_remove_k3 = "\ + qtwebbrowser \ + qtwebbrowser-examples \ + qtwebengine-examples \ +" QT_DEMOS = "\ qt-tstat \
meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb +3 -3
@@ -10,14 +10,14 @@ inherit qt-provider RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" DEPENDS += "${QT_DEPENDS_WEBENGINE}" -#DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}" -#DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}" +DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}" +DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}" PR = "r16" QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79" QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc" -#QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5" +QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5" SRCREV = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_SRCREV}", "${QT4_SRCREV}", d)}"
meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb +8 -8
@@ -67,15 +67,15 @@ QT5_DEV = " \ qtserialport-dev \ " -#QT5_DEV_append_k3 = " \ -# qtwebkit-mkspecs \ -# qtwebkit-dev \ -#" +QT5_DEV_append_k3 = " \ + qtwebkit-mkspecs \ + qtwebkit-dev \ +" -#QT5_DEV_remove_k3 = " \ -# qtwebengine-mkspecs \ -# qtwebengine-dev \ -#" +QT5_DEV_remove_k3 = " \ + qtwebengine-mkspecs \ + qtwebengine-dev \ +" RDEPENDS_${PN} += " \ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \
Signature · 1 line
2.7.4