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 --- conf/distro/include/apalis-imx6.conf | 1 + conf/distro/include/colibri-imx6.conf | 1 + conf/distro/include/imx53qsb.conf | 2 + conf/distro/include/imx6.inc | 2 + conf/distro/include/imx6qsabresd.conf | 2 + conf/distro/include/nitrogen6x.conf | 2 + conf/distro/include/toradex.inc | 3 +- .../packagegroup-b2qt-embedded-qt5-addons.bb | 2 - ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 3 +- .../packagegroup-b2qt-embedded-qt5.bb | 4 +- recipes-qt/qt5-addons/qtquickcompiler_2.0.bb | 44 ---------------------- recipes-qt/qt5-addons/qtquickcompiler_3.0.bb | 44 ++++++++++++++++++++++ recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 2 +- recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri | 2 +- recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri | 3 +- scripts/manifest_qt5.xml | 2 +- 16 files changed, 65 insertions(+), 54 deletions(-) create mode 100644 conf/distro/include/imx6.inc delete mode 100644 recipes-qt/qt5-addons/qtquickcompiler_2.0.bb create mode 100644 recipes-qt/qt5-addons/qtquickcompiler_3.0.bb diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index ee811be..c1e9c1b 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -21,6 +21,7 @@ ############################################################################# include conf/distro/include/toradex.inc +include conf/distro/include/imx6.inc KERNEL_IMAGETYPE = "uImage" diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 1171c5f..8a048b1 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -21,6 +21,7 @@ ############################################################################# include conf/distro/include/toradex.inc +include conf/distro/include/imx6.inc KERNEL_IMAGETYPE = "uImage" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 7154b6f..457f168 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + BOOTFS_CONTENT = "\ u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc new file mode 100644 index 0000000..5cb3814 --- /dev/null +++ b/conf/distro/include/imx6.inc @@ -0,0 +1,2 @@ +BBMASK ?= " " +BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5" diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 83fc812..74b22d3 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index af1f869..d9a11ab 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 67c5c75..5256eb4 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -1 +1,2 @@ -BBMASK += "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" +BBMASK ?= " " +BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" 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)} \ " diff --git a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb deleted file mode 100644 index fd7e8be..0000000 --- a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Qt Quick Compiler" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6" - -inherit qt5-module - -SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${QT_BRANCH};protocol=ssh;name=compiler;destsuffix=git \ - git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${QT_BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ - " - -SRCREV_compiler = "60c13275dec85d8224ea5826ae5533d87c65e76e" -QT_BRANCH_compiler = "2.0" - -SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" -QT_BRANCH_sdk = "master" - -S = "${WORKDIR}/git" - -DEPENDS = "qtbase qtdeclarative" - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb new file mode 100644 index 0000000..6f9fa30 --- /dev/null +++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick Compiler" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \ + git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ + " + +SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e" +BRANCH_compiler = "3.0" + +SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" +BRANCH_sdk = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative" + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index 571792c..e66373d 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -32,7 +32,7 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ " -SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97" +SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" QT_BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri index cf89ae6..f365169 100644 --- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri @@ -5,4 +5,4 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL QMAKE_CFLAGS += $$IMX6_CFLAGS QMAKE_CXXFLAGS += $$IMX6_CFLAGS -EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-imx6-g++/qeglfshooks_imx6.cpp +EGLFS_DEVICE_INTEGRATION = eglfs_viv diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri index bddd245..84488cb 100644 --- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri @@ -6,5 +6,4 @@ QMAKE_LIBS_EGL = -lEGL -lGLESv2 QMAKE_CFLAGS += $$RPI_CFLAGS QMAKE_CXXFLAGS += $$RPI_CFLAGS -EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp -EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host +EGLFS_DEVICE_INTEGRATION = eglfs_brcm diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml index fbd5069..1a50a10 100644 --- a/scripts/manifest_qt5.xml +++ b/scripts/manifest_qt5.xml @@ -7,7 +7,7 @@ -- cgit v1.2.3-54-g00ecf