summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-12-01 12:24:46 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-12-13 23:23:46 +0000
commit56e07fa94196219316b643bc43f2bf131887a2f5 (patch)
tree70af50f93078758be812c026ae3ccebbd10c5d8e
parent97c2daa1c4846a1225b88368ee48841bd5206634 (diff)
Removing qtwebkit to be replaced by qtwebengine
Bug-AGL: SPEC-1159 Change-Id: Ieecc7cc51015dd0b7ce689e90f43fcd17b3eb62d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12495 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rwxr-xr-xmeta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime2
-rw-r--r--meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb1
2 files changed, 1 insertions, 2 deletions
diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime
index ca712e155..80685eb81 100755
--- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime
+++ b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/bin/qt5/qmlscene "$1" /usr/bin/web-runtime-webkit.qml
+exec /usr/bin/qt5/qmlscene "$1" /usr/bin/web-runtime.qml
diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb b/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb
index c58daea30..8cbe08a76 100644
--- a/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb
+++ b/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb
@@ -14,7 +14,6 @@ SRC_URI = "\
RDEPENDS_${PN} = "\
qtdeclarative-tools \
- qtwebkit-qmlplugins \
qtwayland-qmlplugins \
qtquickcontrols-qmlplugins \
"