From 96732bd9d297d8bc16eff95fc04ff45d1a4fbefe Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Tue, 14 Jun 2016 15:05:48 +0300 Subject: [PATCH 1/9] Update boot2qt-demos version Fixes compile error due qtwebbrowser repo name change. Change-Id: I712a8e260212f4e159d9acc80c9f95848c4e7f31 Reviewed-by: Gatis Paeglis --- recipes-qt/b2qt-addons/b2qt-demos.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 0a3fe3c..6dba2d3 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 = "1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033" +SRCREV_demos = "2dcc014980437b87564b7f9f86a06894efa5ea75" SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df" SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc" From 39e84aa944780b52a6622969e9c3b623dc71422c Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Mon, 20 Jun 2016 13:49:18 +0300 Subject: [PATCH 2/9] Update qtdeclarative module Task-number: QTBUG-53761 Change-Id: Ia5c983c36d3e55cd3d8dcee0d1903e241c066d9d Reviewed-by: Risto Avila Reviewed-by: Teemu Holappa --- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 01480a6..76a1d42 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "18e77550f149722e0554f24ddfa326e03a9fef10" +SRCREV = "9b1231ca3d21ade574a8a7cf3f0805a8b520bcd5" From a9c0c957a458a17be52cef418a5fec22760a69cf Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Tue, 28 Jun 2016 15:23:26 +0300 Subject: [PATCH 3/9] Change git protocol from ssh to http Task-number: QTBUG-54280 Change-Id: I6a538230b68cb9bea8a89c17282eb25cd779a77d Reviewed-by: Gatis Paeglis --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- recipes-qt/b2qt-addons/b2qt-demos.bb | 4 ++-- recipes-qt/b2qt-addons/b2qt-launcher.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 4dcac1d..7987958 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094" inherit qt5-module systemd SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=http \ file://neptune.service \ " diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 6dba2d3..6a59871 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -26,10 +26,10 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc inherit qmake5 sdk-sources SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=ssh;name=demos \ + git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=http;name=demos \ ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ - git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ + git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=http;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ " diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 6fbcf45..7283cac 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beg inherit qmake5 SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=http \ file://b2qt-startup.sh \ file://qtlauncher.service \ file://b2qt.service \ From b421956621a4e4389ba6c68cbf3fb7aa692fa566 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 18 Aug 2016 14:13:34 +0300 Subject: [PATCH 4/9] Correctly use QtQuickCompiler when available Make sure the we use QtQuickCompiler only when we either have access to the sources (internal gerrit repo) or the prebuilt binaries are available. The internal-build class checks if we are working within The Qt Company network, so we will also have access to the sources. Setting ENABLE_QTQUICKCOMPILER env to "1" in local.conf has the same effect. Otherwise check if the prebuilt binaries are available as installed by the Qt Online SDK. Change-Id: I63b09ebabc96bb14b119ea7472a3fa7b10e5c2a8 Task-number: QTBUG-53052 Task-number: QTBUG-53216 Reviewed-by: Teemu Holappa --- classes/internal-build.bbclass | 1 + classes/qtquickcompiler.bbclass | 20 ++++++++++---------- conf/local.conf.sample | 3 +++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index 2a975f6..72498cb 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass @@ -26,6 +26,7 @@ python enable_internal_build () { except: return + e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") e.data.setVar('PREMIRRORS', "\ ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \ diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index b6710be..90fcfb4 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -20,18 +20,18 @@ ############################################################################## python __anonymous() { - provider = "qtquickcompiler" + provider = "" + sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk" + pn = d.getVar("PN", True) - sdk_path = d.getVar('QT_SDK_PATH', True) or "" - if len(sdk_path) != 0: - qtquickcompiler_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk" - if not os.path.isdir(qtquickcompiler_path): - bb.note("QtQuickCompiler not available") - return - else: - provider = "qtquickcompiler-sdk" + if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1": + provider = "qtquickcompiler" + elif os.path.isdir(sdk_path): + provider = "qtquickcompiler-sdk" + else: + bb.note("qtquickcompiler not enabled for %s" % pn) + return - pn = d.getVar("PN", True) if "toolchain-host" in pn: d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider) if "toolchain-target" in pn: diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 5dd5c3d..ad55f78 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -273,6 +273,9 @@ INHERIT += "rm_work" INHERIT += "image-buildinfo" INHERIT += "internal-build" +# Enables use of QtQuickCompiler if you have access to the gerrit project +#ENABLE_QTQUICKCOMPILER = "1" + ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_WHITELIST = "commercial" From 39b77b9a9437f471d00269c3fbf2177d07045386 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 18 Aug 2016 15:52:02 +0300 Subject: [PATCH 5/9] Handle qtquickcompiler in update-qt5-modules.sh script QtQuickCompiler has different git repo name in tqtc-qt5.git Change-Id: I038eec220166dcd06e653460aa0d5ed525f549d4 Reviewed-by: Teemu Holappa --- scripts/update-qt5-modules.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh index a0c9ea9..fe63f80 100755 --- a/scripts/update-qt5-modules.sh +++ b/scripts/update-qt5-modules.sh @@ -39,6 +39,9 @@ for S in $SHA1S; do elif [ "${PROJECT}" = "qtwebengine/src/3rdparty" ]; then sed -i -e "/^SRCREV_chromium/s/\".*\"/\"${SHA1}\"/" qtwebengine_git.bb* echo "qtwebengine (chromium) -> ${SHA1}" + elif [ "${PROJECT}" = "tqtc-qmlcompiler" ]; then + sed -i -e "/^SRCREV_chromium/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb* + echo "qtquickcompiler -> ${SHA1}" elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb* echo "${PROJECT} -> ${SHA1}" From 0f967048d5bd99ffacfb9893b76818293aaaa8a0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 18 Aug 2016 15:54:29 +0300 Subject: [PATCH 6/9] Update Qt5 submodules Moved some of the addon recipes to be under qt5 folder, so that update-qt5-modules.sh script will work for those as well. Using latest revision from meta-qt5 and applied necessary changes to qt5 recipes. Change-Id: I802ca2e4ea67bde10c3b065365d25f1e543da181 Reviewed-by: Teemu Holappa --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 4 ++-- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 +- recipes-qt/{qt5-addons => qt5}/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/{qt5-addons => qt5}/qtdatavis3d_git.bb | 0 .../{qt5-addons => qt5}/qtdeclarative-render2d_git.bb | 0 recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 2 +- recipes-qt/qt5/qtimageformats_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/{qt5-addons => qt5}/qtquickcompiler_git.bb | 0 recipes-qt/qt5/qtquickcontrols2_git.bb | 6 +++--- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 6 +++--- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qtsvg_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/{qt5-addons => qt5}/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland-native_5.7-wip.bb | 8 ++++++++ recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_5.7-wip.bb | 8 ++++++++ recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bbappend | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 +- scripts/manifest.xml | 2 +- 33 files changed, 50 insertions(+), 34 deletions(-) rename recipes-qt/{qt5-addons => qt5}/qtcharts_git.bb (95%) rename recipes-qt/{qt5-addons => qt5}/qtdatavis3d_git.bb (100%) rename recipes-qt/{qt5-addons => qt5}/qtdeclarative-render2d_git.bb (100%) rename recipes-qt/{qt5-addons => qt5}/qtquickcompiler_git.bb (100%) rename recipes-qt/{qt5-addons => qt5}/qtvirtualkeyboard_git.bb (98%) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 326bdec..ae8e6f4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" +SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index f7ae884..349ef9a 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "2270fae50f8d69858b2df2287342c02a4cd5357c" +SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 31cc314..8d86d39 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" +SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index e2c4191..19cd2d6 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -PACKAGECONFIG_GL = "gles2" +PACKAGECONFIG_GL = "gles2 eglfs" PACKAGECONFIG += " \ accessibility \ alsa \ @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" +SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 7a16176..95ef942 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "72312730a7507f77898df0876b9437c43587e1d1" +SRCREV = "2778071f6c80b5397a183db37114aef881ade855" diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb similarity index 95% rename from recipes-qt/qt5-addons/qtcharts_git.bb rename to recipes-qt/qt5/qtcharts_git.bb index 559beb7..4b7a38a 100644 --- a/recipes-qt/qt5-addons/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "d137ae33ccf01882f80770919b1daa199dec7019" +SRCREV = "c6d72bb6ebd860a38aac2e557bca330b0d5b1926" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 018157e..934b40f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "7393531856058a8a0fe440d3a64728248958ac81" +SRCREV = "f5fe6ce47841be34d4b851725d80133ff6d14fee" diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb similarity index 100% rename from recipes-qt/qt5-addons/qtdatavis3d_git.bb rename to recipes-qt/qt5/qtdatavis3d_git.bb diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb similarity index 100% rename from recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb rename to recipes-qt/qt5/qtdeclarative-render2d_git.bb diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 76a1d42..8450938 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "9b1231ca3d21ade574a8a7cf3f0805a8b520bcd5" +SRCREV = "b1eeb7cdde17f70e8e9ad3c610d6492f3ca70717" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index f7b6d74..f164c73 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "d01a936b6454834e8ead7acc5838ee5c66541a55" +SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 9a83783..afa85cb 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "cbf2d7e7696a4a08360c2004dfcbb8be7c1d2edb" +SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 8397e50..3f93547 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "2bdeea286037e5ea0d8ba0d2ad59bdf1eaae1054" +SRCREV = "fafc158427e9d54298ce5c3419c1d4b6ec3b946e" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index 818bc01..ecc7f15 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "711efc552d65f22b262e049c5a046198377519dc" +SRCREV = "c9de25fa342ff8066d49541179c30d0ce45950b4" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb similarity index 100% rename from recipes-qt/qt5-addons/qtquickcompiler_git.bb rename to recipes-qt/qt5/qtquickcompiler_git.bb diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 26aa40e..c6dec9f 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -24,14 +24,14 @@ require recipes-qt/qt5/qt5-git.inc LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-3.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ - file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" -SRCREV = "6ea6881ec8847dc99e05534769d6fe6198f56ead" +SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244" FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/*/*/designer \ diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index a52513c..e0b892d 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -21,4 +21,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCREV = "fcc9c0206433c5c940a0872447899743d1a9996a" +SRCREV = "c0f58d5283ce981b8cfbc43f602a3b6553e26ce2" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index dc59a6a..30e96b2 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "b08c3e69e3e82014b0f16b1ff94e5edd31d5c2c6" +SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index cfb710c..491781c 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -24,11 +24,11 @@ require recipes-qt/qt5/qt5-git.inc LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ " DEPENDS += "qtbase qtserialport" -SRCREV = "ec7b4b226818fa39646ec9c619b9df995952ea9c" +SRCREV = "0c63b3a441437a8bc42770d360a6696bbf11cd2d" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index ef91dc4..7fbdf67 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "c1355ae41ee46437e9d6583dc4ea452a82b6b53b" +SRCREV = "b0e3e7469cf5249bb395d044c5344bbe88884553" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index c486a2d..755a49b 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "0e69a7c86f1908bc282362ec59f0ccf97d35d63a" +SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 232f920..4234480 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2d838dd06ebacc58c620614719067f6dac5e7418" +SRCREV = "85197ddb8d6da0e5cf74b8d945c076d4db3986a8" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index aeac682..f8021a5 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "efa6513bbf2515fbe6ab7b365e9597a8900ae279" +SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb similarity index 98% rename from recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb rename to recipes-qt/qt5/qtvirtualkeyboard_git.bb index 85dfcbb..ef78418 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "8b75b05f8b515efc6f1a6a40214cf61abc4d8a9f" +SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb index 455726a..a83d6dc 100644 --- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb +++ b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb @@ -23,6 +23,14 @@ require recipes-qt/qt5/qtwayland-native_git.bb FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2" PV = "5.7-wip+git${SRCPV}" QT_MODULE_BRANCH = "wip-compositor-api" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 8849fd8..793ed1b 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "920387296abcead6fea2d801fb2f57c185657c47" +SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb index 2de879b..fb59bba 100644 --- a/recipes-qt/qt5/qtwayland_5.7-wip.bb +++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb @@ -21,6 +21,14 @@ require recipes-qt/qt5/qtwayland_git.bb +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658" PV = "5.7-wip+git${SRCPV}" QT_MODULE_BRANCH = "wip-compositor-api" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 8849fd8..793ed1b 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "920387296abcead6fea2d801fb2f57c185657c47" +SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 672745e..7e87e21 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "b06c69533baeb2f80897f72ed787b51e122ffafc" +SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index a7920fd..0a094f4 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "69351428413edb7a76ce2ca11634b1797e45e296" -SRCREV_chromium = "dc08e3972d36a63dd477de0de005b3e81a5674d9" +SRCREV_qtwebengine = "b7fde78d7822ed7f2221acfd9db15b3ff579e29d" +SRCREV_chromium = "696c084930b870a5b1fd7f176d4e7ccb3eff416c" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 8b8c9cd..274e4a4 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "0637eb3f40440f90eb531561e26f3854463bdbb3" +SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 3150a1b..8594a95 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "23b764d34705d0f858e428e02c910637368b2694" +SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 46fbbea..2fb5349 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -25,7 +25,7 @@ path="sources/meta-openembedded"/> Date: Mon, 22 Aug 2016 10:21:53 +0300 Subject: [PATCH 7/9] Remove automotive recipes Automotive was released (and supported) in the jethro Change-Id: Iab8560b4b0d530e872eef585c635b45274a4507b Reviewed-by: Teemu Holappa --- conf/distro/b2qt-auto.conf | 25 -------- recipes-qt/automotive/gammaray_git.bb | 29 --------- .../automotive/neptune-ui/neptune.service | 11 ---- recipes-qt/automotive/neptune-ui_git.bb | 62 ------------------- .../automotive/qtapplicationmanager_git.bb | 58 ----------------- recipes-qt/automotive/qtivi_git.bb | 37 ----------- recipes-qt/automotive/qtwebbrowser_git.bb | 40 ------------ .../images/b2qt-automotive-qt5-image.bb | 50 --------------- .../meta-toolchain-b2qt-automotive-qt5-sdk.bb | 31 ---------- 9 files changed, 343 deletions(-) delete mode 100644 conf/distro/b2qt-auto.conf delete mode 100644 recipes-qt/automotive/gammaray_git.bb delete mode 100644 recipes-qt/automotive/neptune-ui/neptune.service delete mode 100644 recipes-qt/automotive/neptune-ui_git.bb delete mode 100644 recipes-qt/automotive/qtapplicationmanager_git.bb delete mode 100644 recipes-qt/automotive/qtivi_git.bb delete mode 100644 recipes-qt/automotive/qtwebbrowser_git.bb delete mode 100644 recipes-qt/images/b2qt-automotive-qt5-image.bb delete mode 100644 recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb diff --git a/conf/distro/b2qt-auto.conf b/conf/distro/b2qt-auto.conf deleted file mode 100644 index 46d41eb..0000000 --- a/conf/distro/b2qt-auto.conf +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -include conf/distro/b2qt.conf - -PREFERRED_VERSION_qtwayland = "5.6%" -PREFERRED_VERSION_qtwayland-native = "5.6%" diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb deleted file mode 100644 index 033e534..0000000 --- a/recipes-qt/automotive/gammaray_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GammaRay Qt introspection probe" -HOMEPAGE = "http://www.kdab.com/gammaray" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=5996517d53e3c2722d457fb633e970ed" - -inherit cmake_qt5 - -SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" - -BRANCH = "2.4" -SRCREV = "4995051c9d6733ce3eabb486283160bf31c87c10" -PV = "2.5.50+git${SRCPV}" - -DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += " -DGAMMARAY_BUILD_UI=OFF" - -FILES_${PN}-dev += " \ - /usr/lib/cmake/* \ - /usr/mkspecs/modules/* \ -" -FILES_${PN}-dbg += " \ - /usr/lib/.debug/* \ - /usr/lib/gammaray/*/*/.debug \ - /usr/lib/gammaray/*/*/styles/.debug \ -" diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service deleted file mode 100644 index 9d7881c..0000000 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Neptune -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main1280x800.qml -Restart=on-failure -WorkingDirectory=/opt/neptune - -[Install] -WantedBy=multi-user.target diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb deleted file mode 100644 index 7987958..0000000 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Neptune IVI UI" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094" - -inherit qt5-module systemd - -SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=http \ - file://neptune.service \ - " - -SRCREV = "b3f10d156349727310ec30b27d01e639cce4f570" -BRANCH = "master" - -S = "${WORKDIR}/git" - -DEPENDS = "qtbase qtdeclarative" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ - ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" - -do_configure_prepend() { - echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro -} - -do_install_append() { - install -m 0755 -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ - - install -m 0644 ${S}/Main*.qml ${D}/opt/neptune - install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune -} - -PACKAGES =+ "${PN}-apps" -RRECOMMENDS_${PN} += "${PN}-apps" - -FILES_${PN}-apps += "/opt/neptune/apps" -FILES_${PN} += "\ - /opt/neptune \ - " - -SYSTEMD_SERVICE_${PN} = "neptune.service" diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb deleted file mode 100644 index 502dd06..0000000 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Qt component for application lifecycle management" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=311507adb75495acc0b61d69109485ce" - -inherit qmake5 - -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \ - " - -SRCREV = "b7578378b578788c2ae9c60708a2908d3b090c16" -BRANCH = "dev" - -DEPENDS = "qtbase qtdeclarative libyaml libarchive \ - ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" - -S = "${WORKDIR}/git" - -EXTRA_QMAKEVARS_PRE += "\ - -config force-singleprocess \ - -config enable-dummydata \ - -config enable-ivi-logging \ - -config install-prefix=/usr \ - -config systemd-workaround \ - " - -do_install_append() { - install -m 0755 -d ${D}/opt/am/ - install -m 0644 ${S}/template-opt/am/config.yaml ${D}/opt/am/ -} - -FILES_${PN} += "\ - /opt/am \ - ${libdir}/appman \ - ${datadir}/dbus-1" -FILES_${PN}-dbg += "${libdir}/appman/.debug" -FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/*.prl" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb deleted file mode 100644 index 038a0c4..0000000 --- a/recipes-qt/automotive/qtivi_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Qt IVI" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://header.LGPL3-PELAGICORE;md5=0f5beb4df202cb6ef5cbc5296f3a3fa4" - -inherit qt5-module - -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \ - " - -SRCREV = "2d378320dc07b8b3ac9a9ce89b7f7a99caa72f8a" -BRANCH = "dev" - -S = "${WORKDIR}/git" - -DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb deleted file mode 100644 index 25494bf..0000000 --- a/recipes-qt/automotive/qtwebbrowser_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "Qt Web Browser" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://src/main.cpp;md5=e78c6c33aa5ec2464456b72daf61ef9c;beginline=1;endline=36" - -inherit qmake5 sdk-sources - -SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtwebbrowser \ - " - -SRCREV = "2e18b419a7084b1e39bf8749855768a1002e34de" -BRANCH = "dev" - -S = "${WORKDIR}/git" - -DEPENDS = "qtbase qtdeclarative qtwebengine" - -FILES_${PN} += "/data/user/qt/qtwebbrowser" -FILES_${PN}-dbg += "/data/user/qt/qtwebbrowser/.debug" diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb deleted file mode 100644 index 004c2e8..0000000 --- a/recipes-qt/images/b2qt-automotive-qt5-image.bb +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "B2Qt Automotive Qt5 image" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" -PR = "r0" - -DEPLOY_CONF_TYPE = "Automotive" - -IMAGE_FEATURES += "\ - package-management \ - ssh-server-dropbear \ - tools-debug \ - debug-tweaks \ - hwcodecs \ - " - -inherit core-image -inherit bootfs-image - -MACHINE_EXTRA_INSTALL_QT ?= "" - -IMAGE_INSTALL += "\ - ${MACHINE_EXTRA_INSTALL_QT} \ - packagegroup-b2qt-embedded-base \ - packagegroup-b2qt-embedded-tools \ - ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ - packagegroup-b2qt-qt5-modules \ - packagegroup-b2qt-automotive-addons \ - " diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb deleted file mode 100644 index 945a330..0000000 --- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" - -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" - -inherit populate_b2qt_qt5_sdk - -TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" -TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \ - packagegroup-b2qt-automotive-qt5-toolchain-target" From cec708c11e6c83891ad33910633cc9119d523b32 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Aug 2016 10:32:11 +0300 Subject: [PATCH 8/9] Reuse qt5-git.inc to define git repo location Instead of using codereview.qt-project.org directly, reuse qt5-git.inc from meta-qt5 that defines git url to be used which simplyfies the recipes. Also cleanup unnecessary use of sdk-sources for opened repos. Change-Id: Iec18e7d7d0b1a2da6ec5ed03ab6599af8d539fea Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-demos.bb | 6 +++--- recipes-qt/b2qt-addons/b2qt-launcher.bb | 10 ++++------ recipes-qt/b2qt-addons/democompositor_git.bb | 9 +++------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 6a59871..c8423e1 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -23,13 +23,13 @@ DESCRIPTION = "Boot to Qt Demos" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" -inherit qmake5 sdk-sources +inherit qmake5 SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=http;name=demos \ + ${QT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \ ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ - git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=http;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ + ${QT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ " diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 7283cac..bdcb293 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -24,19 +24,17 @@ LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" inherit qmake5 +require recipes-qt/qt5/qt5-git.inc -SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=http \ +QT_MODULE = "qt-apps-boot2qt-launcher" + +SRC_URI += " \ file://b2qt-startup.sh \ file://qtlauncher.service \ file://b2qt.service \ " SRCREV = "f5aaf9297648b397ee8fecb0a494b4774e130422" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" - -S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb index 314e491..e3ca81c 100644 --- a/recipes-qt/b2qt-addons/democompositor_git.bb +++ b/recipes-qt/b2qt-addons/democompositor_git.bb @@ -23,15 +23,12 @@ DESCRIPTION = "Boot to Qt Wayland Demo Compositor" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://main.cpp;md5=56e7f80d726792929d5d089852de7cde;beginline=1;endline=39" -inherit qmake5 sdk-sources +inherit qmake5 +require recipes-qt/qt5/qt5-git.inc -SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \ - " +QT_MODULE = "qt-apps-boot2qt-demos" SRCREV = "b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" S = "${WORKDIR}/git/wayland/democompositor/" From 797b8c96bd53cd15b6540a989353f89d285c8de9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Aug 2016 15:00:03 +0300 Subject: [PATCH 9/9] Correctly update qtquickcompiler SHA1 Change-Id: I0176af2f3f8d8f3d04b9898138d7d745a345ed76 Reviewed-by: Simon Hausmann --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- scripts/update-qt5-modules.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 6018770..4b9abd8 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -SRCREV = "a2eac30f3be41447af1c9f2c3f3c841b68ca4d9c" +SRCREV = "321c7d8bbc9e25fbb49dbba187b04916eddfdb2a" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh index fe63f80..824cb3e 100755 --- a/scripts/update-qt5-modules.sh +++ b/scripts/update-qt5-modules.sh @@ -40,7 +40,7 @@ for S in $SHA1S; do sed -i -e "/^SRCREV_chromium/s/\".*\"/\"${SHA1}\"/" qtwebengine_git.bb* echo "qtwebengine (chromium) -> ${SHA1}" elif [ "${PROJECT}" = "tqtc-qmlcompiler" ]; then - sed -i -e "/^SRCREV_chromium/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb* + sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb* echo "qtquickcompiler -> ${SHA1}" elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*