From 641df47d096fb559d6f4f444670205e4510d6791 Mon Sep 17 00:00:00 2001 From: Stephane DESNEUX Date: Fri, 24 Jun 2016 10:15:26 +0000 Subject: Revert "add meta-app-framework to meta-agl" This reverts commit 80f4d503fc5bb2564b72b72daedebf74612c30f3. Change-Id: I94605d4c0ef80433fa6eaa05e63a9c6cf69baea4 Signed-off-by: Stephane Desneux --- .../web-runtime/web-runtime/web-runtime | 2 -- .../web-runtime/web-runtime/web-runtime-webkit.qml | 13 --------- .../web-runtime/web-runtime/web-runtime.qml | 13 --------- .../recipes-core/web-runtime/web-runtime_0.1.bb | 34 ---------------------- 4 files changed, 62 deletions(-) delete mode 100755 meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime delete mode 100644 meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml delete mode 100644 meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml delete mode 100644 meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb (limited to 'meta-app-framework/recipes-core/web-runtime') 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 deleted file mode 100755 index ca712e155..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/qt5/qmlscene "$1" /usr/bin/web-runtime-webkit.qml diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml deleted file mode 100644 index d18b672cd..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime-webkit.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtWebKit 3.0 - -ApplicationWindow { - width: 1024 - height: 768 - visible: true - WebView { - url: Qt.application.arguments[1] - anchors.fill: parent - } -} diff --git a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml b/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml deleted file mode 100644 index afe8a77d0..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime/web-runtime.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtWebEngine 1.1 - -ApplicationWindow { - width: 1024 - height: 768 - visible: true - WebEngineView { - url: Qt.application.arguments[1] - anchors.fill: parent - } -} 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 deleted file mode 100644 index 9df4dff2d..000000000 --- a/meta-app-framework/recipes-core/web-runtime/web-runtime_0.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -inherit allarch - -SUMMARY = "Provides the 'web-runtime' command" -DESCRIPTION = "The command 'web-runtime' is an abstraction that allows to " - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "\ - file://web-runtime;md5sum=00cdb6980e03cf8c8f7d60dd978c61d7 \ - file://web-runtime.qml;md5sum=5d6a379e9b7e5654319e5ba638824a58 \ - file://web-runtime-webkit.qml;md5sum=4daf9df39078634c27a7923d37e82e3d \ -" - -RDEPENDS_${PN} = "qtwebkit-qmlplugins" - -do_configure() { - : -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/web-runtime ${D}${bindir}/web-runtime - install -m 0644 ${WORKDIR}/web-runtime.qml ${D}${bindir}/web-runtime.qml - install -m 0644 ${WORKDIR}/web-runtime-webkit.qml ${D}${bindir}/web-runtime-webkit.qml -} - -do_install_append_rcar-gen2() { - # workaround for porter board: force the use of libEGL provided by mesa at runtime - # otherwise, the proprietary libEGL is used and a problem then occurs due to a missing EGL function - sed -i 's|^\(exec /usr/bin/qt5/qmlscene\)|LD_PRELOAD=/usr/lib/libEGL.so \1|g' ${D}${bindir}/web-runtime -} - - -- cgit 1.2.3-korg