From da5b6534ebae27c1e70aeaf51e71f21b7c0d9223 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Oct 2015 14:43:35 +0300 Subject: qt5: add qt5-module.bbclass Upstream does not yet have the qt5-module.bbclass, until the change gets merged, add our own bbclass. Change-Id: Iea906d38a23024467a769210667fc32f4375419f Reviewed-by: Teemu Holappa --- classes/qt5-module.bbclass | 1 + 1 file changed, 1 insertion(+) create mode 100644 classes/qt5-module.bbclass diff --git a/classes/qt5-module.bbclass b/classes/qt5-module.bbclass new file mode 100644 index 0000000..2f186e8 --- /dev/null +++ b/classes/qt5-module.bbclass @@ -0,0 +1 @@ +require recipes-qt/qt5/qt5.inc -- cgit v1.2.3-54-g00ecf From 037ebc1c5b808d6fe48143a39e1303210ad7f211 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Oct 2015 14:50:20 +0300 Subject: qt5: use the upstream meta-qt5 layer all the necessary changes are merged to upstream meta-qt5 layer, so we can start using it. Change-Id: I1b0289a59dd734acd80ba61d946531024716f927 Reviewed-by: Teemu Holappa --- scripts/manifest.xml | 5 +++++ scripts/manifest_dizzy.xml | 5 +++++ scripts/manifest_qt5.xml | 13 ------------- 3 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 scripts/manifest_qt5.xml diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4a88a1b..acdbe21 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -9,6 +9,7 @@ + + + + - - - - - - - - - -- cgit v1.2.3-54-g00ecf From 050481493d51d12e4a6035341f4a9610a0a56485 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Oct 2015 16:24:08 +0300 Subject: qt5: sync installed qt modules in image and toolchain Change-Id: I379426397749e1c39e7d0631b361b96699bce95d Reviewed-by: Teemu Holappa --- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 1 - recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 0fb16ef..a64f457 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -47,7 +47,6 @@ RDEPENDS_${PN} += " \ qtsensors-dev \ qtserialport-dev \ qtsvg-dev \ - qtsystems-dev \ qttools-dev \ qttools-staticdev \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index 93785a0..861f61a 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -42,9 +42,11 @@ RDEPENDS_${PN} += " \ qtsensors \ qtserialport \ qtsvg \ + qttools \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ qtwebsockets \ + qtwebchannel \ qtxmlpatterns \ qtquickcontrols \ " -- cgit v1.2.3-54-g00ecf From a2d7a1698ebebdb40829fc20cd89115bc584fd94 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 19 Oct 2015 10:28:40 +0300 Subject: qt5: all repos moved from qt-gerrit to codereview Change-Id: I66b4d90990ad8be9a4dc9ce2b157c3325176adfa Reviewed-by: Teemu Holappa --- recipes-qt/qt5-addons/qtglesstream.bb | 2 +- recipes-qt/qt5-addons/qtquick2drenderer.bb | 2 +- recipes-qt/qt5-addons/qtquickcompiler_3.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 06cec02..dfcda8d 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0 inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtglesstream.git;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/qt/tqtc-qtglesstream;branch=${BRANCH};protocol=ssh \ " PV = "1.0.0" diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb index 13b6b72..b57fc0b 100644 --- a/recipes-qt/qt5-addons/qtquick2drenderer.bb +++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ + git://codereview.qt-project.org/qt/tqtc-scenegraph-raster;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ " # v1.1.1 diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb index 9c3d43b..6226e6e 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;destsuffix=git \ + git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " # v3.0.0 -- cgit v1.2.3-54-g00ecf