deleted file mode 100644
@@ -1,32 +0,0 @@
-From 720056bbce57184c1f352abb160942dbff2c1cd0 Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1@ti.com>
-Date: Tue, 6 Jun 2017 14:40:08 -0400
-Subject: [PATCH] qtwebbrowser: disable FullScreen mode
-
-We need to disable full-screen mode because there is no way to exit
-when the browser is launched from matrix-gui
-
-Upstream-Status: Inappropriate
-It is a TI-specific workaround per matrix-gui operation
-
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
----
- src/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 2181f15..5f146b6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -101,7 +101,7 @@ int main(int argc, char **argv)
- if (view.size().isEmpty())
- view.setGeometry(0, 0, 800, 600);
- #else
-- view.showFullScreen();
-+ view.show();
- #endif
-
- app.exec();
-1.9.1
-
deleted file mode 100644
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
- file://0001-qtwebbrowser-disable-FullScreen-mode.patch \
-"
-
-PR:append = ".arago0"
similarity index 60%
rename from meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
rename to meta-arago-extras/recipes-qt/examples/qtwebbrowser_5.15.1.bb
@@ -7,22 +7,19 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
-DEPENDS += "qtwebengine"
+DEPENDS += "qtbase qtdeclarative qtwebengine"
PACKAGES += "${PN}-examples"
-PR = "r1"
+PR = "r0"
BRANCH = "dev"
-SRCREV = "023733af5523a5ad84359926224fa106001215f4"
-
-SRC_URI = "git://code.qt.io/qt-apps/qtwebbrowser.git;protocol=git;branch=${BRANCH} \
-"
+SRC_URI = "git://code.qt.io/qt-apps/qtwebbrowser.git;protocol=git;branch=${BRANCH}"
+SRCREV = "a09ec269e8b296d39d78b45ae251edb3d7bada41"
S = "${WORKDIR}/git"
inherit qt5
-# Install qtwebbrowser under /usr/bin
do_install() {
install -d ${D}${bindir}
install -d ${D}${datadir}/examples/webengine/webbrowser/src
@@ -32,3 +29,18 @@ do_install() {
FILES:${PN} += "${bindir}/qtwebbrowser"
FILES:${PN}-examples += "${datadir}/examples/webengine/webbrowser/*"
+
+RDEPENDS:${PN} += " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-qmlplugins', '', d)} \
+ qtvirtualkeyboard-qmlplugins \
+ qtdeclarative-qmlplugins \
+ qtquickcontrols-qmlplugins \
+ qtgraphicaleffects-qmlplugins \
+ qtmultimedia-qmlplugins \
+ qtwebengine-qmlplugins \
+ ttf-dejavu-common \
+ ttf-dejavu-sans \
+ ttf-dejavu-sans-mono \
+ liberation-fonts \
+ ca-certificates \
+"
Update to the latest upstream commit for v5.15.1. While here also drop the appends for this recipe as it is no longer maintained. Signed-off-by: Andrew Davis <afd@ti.com> --- ...qtwebbrowser-disable-FullScreen-mode.patch | 32 ------------------- .../examples/qtwebbrowser_1.0.bbappend | 7 ---- ...bbrowser_1.0.bb => qtwebbrowser_5.15.1.bb} | 26 +++++++++++---- 3 files changed, 19 insertions(+), 46 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/examples/qtwebbrowser/0001-qtwebbrowser-disable-FullScreen-mode.patch delete mode 100644 meta-arago-distro/recipes-qt/examples/qtwebbrowser_1.0.bbappend rename meta-arago-extras/recipes-qt/examples/{qtwebbrowser_1.0.bb => qtwebbrowser_5.15.1.bb} (60%)