From b4af4fa985035f6f530ea78a2b9530347692150e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Jun 2015 13:53:58 +0300 Subject: Update to using Qt 5.5 Changes required to support Qt 5.5. - eglfs hooks are now plugins - disable Qt .bbappends from meta-fsl-extra - include qt3d and qtcanvas3d to image - remove QtQuickEnterpriseControls - use Qt Quick Compiler 3.0 - update Qt VKB sha1 - use 5.5 branch from meta-qt5 (playground repo) Change-Id: I6fe830ee1edf6937c40ddedba06fdf1694f9dacc Reviewed-by: Eirik Aavitsland --- recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb | 2 -- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 3 ++- recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'recipes-qt/packagegroups') diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb index 3ba3f83..76c4430 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb @@ -29,8 +29,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ qtdatavisualization \ - qtquickenterprisecontrols \ - qtquickenterprisecontrols-fonts \ qtcharts \ qtvirtualkeyboard \ b2qt-appcontroller \ 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 a4fc1fa..0fb16ef 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -36,6 +36,7 @@ RDEPENDS_${PN} += " \ qt3d-dev \ qtbase-dev \ qtbase-staticdev \ + qtcanvas3d \ qtconnectivity-dev \ qtdeclarative-dev \ qtdeclarative-staticdev \ @@ -50,9 +51,9 @@ RDEPENDS_${PN} += " \ qttools-dev \ qttools-staticdev \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ qtwebsockets-dev \ qtwebchannel-dev \ qtxmlpatterns-dev \ qtquickcontrols-dev \ - ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index c09d245..93785a0 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -28,8 +28,10 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ + qt3d \ qtbase \ qtbase-fonts \ + qtcanvas3d \ qtconnectivity \ qtdeclarative \ qtdeclarative-tools \ @@ -41,8 +43,8 @@ RDEPENDS_${PN} += " \ qtserialport \ qtsvg \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ qtwebsockets \ qtxmlpatterns \ qtquickcontrols \ - ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ " -- cgit v1.2.3-54-g00ecf