From 8b7aa7dd6f19e74813d68034330c3f25f76e4500 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 4 Oct 2021 11:48:41 +0300 Subject: [PATCH] Add recipe for QtWebView Task-number: QTBUG-97001 Pick-to: 6.2 Change-Id: Id8f7dbfc242baaec11c07f7137e72b429f64cfee Reviewed-by: Mikko Gronoff --- coin/test-configs.inc | 1 + .../packagegroups/packagegroup-qt6-addons.bb | 1 + recipes-qt/qt6/qt6-git.inc | 1 + recipes-qt/qt6/qtwebview_git.bb | 14 ++++++++++++++ 4 files changed, 17 insertions(+) create mode 100644 recipes-qt/qt6/qtwebview_git.bb diff --git a/coin/test-configs.inc b/coin/test-configs.inc index efaa260..e1dcdbb 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -80,3 +80,4 @@ PACKAGECONFIG:append:pn-qtwayland = " examples" PACKAGECONFIG:append:pn-qtwebchannel = " examples" PACKAGECONFIG:append:pn-qtwebengine = " examples" PACKAGECONFIG:append:pn-qtwebsockets = " examples" +PACKAGECONFIG:append:pn-qtwebview = " examples" diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb index ad7f956..10f367e 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb @@ -42,4 +42,5 @@ RDEPENDS:${PN} += " \ qtwebsockets \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-tools', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview', '', d)} \ " diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 0d86ebb..e3a211a 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -54,3 +54,4 @@ SRCREV_qtwebchannel = "5340bc6c3aba51e815431e35557216c716d74c76" SRCREV_qtwebengine = "69baa6b0b9f2fe77f032804ee2376a9b0d6fedfa" SRCREV_qtwebengine-chromium = "202e34476e934633b3c2e4679a53c4b0847364a8" SRCREV_qtwebsockets = "2a4983369532c55f1960beb2251ed3567a30080e" +SRCREV_qtwebview = "1e8b6ab2ca4a1422a8b05d64e132e4eb70e8bc77" diff --git a/recipes-qt/qt6/qtwebview_git.bb b/recipes-qt/qt6/qtwebview_git.bb new file mode 100644 index 0000000..aa6dad3 --- /dev/null +++ b/recipes-qt/qt6/qtwebview_git.bb @@ -0,0 +1,14 @@ +LICENSE = "GFDL-1.3 & BSD & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ +" + +inherit qt6-cmake + +include recipes-qt/qt6/qt6-git.inc +include recipes-qt/qt6/qt6.inc + +DEPENDS += "qtbase qtdeclarative qtwebengine"