From 4fa8b5e34074744518de1659e63617bec8411f47 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 Mar 2016 11:28:49 +0200 Subject: b2qt-demos: update to new revision QtWebBrowser now builds application as well as qml plugin, but for qtlauncher we only need the plugin. Also all the needed files from tqtc-qtwebrowser are in the plugin, we can remove the directory. Task-number: QTEE-1083 Change-Id: Ia135490a4d95ef3428fb54b84ce5c77588e344ef Reviewed-by: Kimmo Ollila --- recipes-qt/b2qt-addons/b2qt-demos.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 2075077..ca7b8ee 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -39,7 +39,7 @@ PV = "5.6+git${SRCPV}" BRANCH = "5.6" BROWSER_BRANCH = "dev" QT_BRANCH = "5.6" -SRCREV_demos = "7076d480edb69cc7d42594acbce00f3a563ed94c" +SRCREV_demos = "cdaf26d23204a0a745885ab0db886388618d50db" SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df" SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc" @@ -59,14 +59,14 @@ do_install_append() { # we only need plugins from the demos rm -rf ${D}/data/user/camera rm -rf ${D}/data/user/sensorexplorer + rm -rf ${D}/data/user/qtwebbrowser # we need all qml and content files cp -r ${S}/* ${D}/data/user/qt/ # but none of the source files find ${D}/data/user/qt/ \( -name '*.cpp' -or -name '*.h' -or -name '*.pro' \) -delete - rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser/.git - rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser/mockups + rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser if [ -d ${WORKDIR}/git/images ]; then install -d 0755 ${D}/data/images -- cgit v1.2.3-54-g00ecf