Skip to contentSkip to conversation

qtwebbrowser: update the example src path to be consistent with qt5

PATCH New Eric Ruei 1 participant 2 messages May 10, 2019

lore
Share & tools
lore

Eric Ruei

author
#0 lore raw

PATCH 1/2 qtwebbrowser: update the example src path to be consistent with qt5

---
 meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb +4 -4
index 907dfefe..c32ec22c 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtwebengine"
 PACKAGES += "${PN}-examples"
 
-PR = "r0"
+PR = "r1"
 
 BRANCH = "dev"
 SRCREV = "023733af5523a5ad84359926224fa106001215f4"
@@ -25,10 +25,10 @@ inherit qt-provider
 # Install qtwebbrowser under /usr/bin
 do_install() {
     install -d ${D}${bindir}
-    install -d ${D}${datadir}/qt5/examples/webengine/webbrowser/src
+    install -d ${D}${datadir}/examples/webengine/webbrowser/src
     install -m 0755 src/qtwebbrowser ${D}${bindir}/qtwebbrowser
-    cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/qt5/examples/webengine/webbrowser/.
+    cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/examples/webengine/webbrowser/.
 }
 
 FILES_${PN} +=  "${bindir}/qtwebbrowser"
-FILES_${PN}-examples +=  "${datadir}/qt5/examples/webengine/webbrowser/*"
+FILES_${PN}-examples +=  "${datadir}/examples/webengine/webbrowser/*"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 qtbase: fix the install path of qt5/examples symbolic link

---
 meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend +3 -2
index 90d04014..6056b9e5 100644
@@ -4,7 +4,7 @@ GLES_EXTRA_DEPS = "libdrm wayland"
 
 PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
 
-PR_append = ".arago15"
+PR_append = ".arago16"
 
 QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
 
@@ -38,6 +38,7 @@ do_install_append () {
     ln -sf ../examples ${D}${datadir}/qt5/examples
 }
 
-FILES_${PN} += "${data}/qt5/*"
+FILES_${PN}-examples +=  "${datadir}/qt5/*"
+
 
 RDEPENDS_${PN} += "${PN}-conf"
Signature · 1 line
2.17.1