X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Frecipes-core%2Faf-main%2Faf-main%2Fadd-qt-wayland-shell-integration.patch;h=c92415b80a7ca974b984e6f080cbe6e5b07fa88e;hb=2ceaa31f4137a5a9fb759338827f4b5d1d995772;hp=f8940f24ae3cef077be5da89d51e2e2b16714759;hpb=8f6992c0c44362d2f614c9df8283cb15029f2e8a;p=AGL%2Fmeta-agl.git diff --git a/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch b/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch index f8940f24a..c92415b80 100644 --- a/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch +++ b/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch @@ -1,24 +1,12 @@ -diff --git a/conf/afm-user-daemon.service b/conf/afm-user-daemon.service -index 6b5c1d8..e0f6799 100644 ---- a/conf/afm-user-daemon.service -+++ b/conf/afm-user-daemon.service -@@ -7,6 +7,7 @@ BusName=org.AGL.afm.user - ExecStart=/usr/bin/afm-user-daemon --user-dbus=unix:path=%t/bus - Environment=AFM_APP_INSTALL_DIR=%%r - Environment=LD_PRELOAD=/usr/lib/libEGL.so +diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf +index 82113ef..2fbc9e2 100644 +--- a/conf/afm-unit.conf ++++ b/conf/afm-unit.conf +@@ -127,6 +127,7 @@ SuccessExitStatus=0 SIGKILL + WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}} + ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}} + Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}} +Environment=QT_WAYLAND_SHELL_INTEGRATION=ivi-shell - Restart=on-failure - RestartSec=5 -diff --git a/docs/quick-tutorial.md b/docs/quick-tutorial.md -index 081dfe5..f55d4d0 100644 ---- a/docs/quick-tutorial.md -+++ b/docs/quick-tutorial.md -@@ -29,6 +29,7 @@ Using the CLI tool - - ### Setup Environment - Connect your AGL target board to the network and copy some sample widgets on it through SSH (set BOARDIP with your board IP address) : -+ - ``` - $ cd afm-widget-examples - $ BOARDIP=1.2.3.4 + %systemd-unit user + {{#required-permission.urn:AGL:permission::public:hidden}}\