summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-12 13:53:58 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-16 11:50:57 +0300
commitb4af4fa985035f6f530ea78a2b9530347692150e (patch)
treea3022b65e50d80fbce5f54221e828a80a7c957dc
parent455e002444b5c293fbdc4e6ba2a20d7c26d0e995 (diff)
downloadmeta-boot2qt-b4af4fa985035f6f530ea78a2b9530347692150e.tar.gz
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 <eirik.aavitsland@theqtcompany.com>
Diffstat
-rw-r--r--conf/distro/include/apalis-imx6.conf1
-rw-r--r--conf/distro/include/colibri-imx6.conf1
-rw-r--r--conf/distro/include/imx53qsb.conf2
-rw-r--r--conf/distro/include/imx6.inc2
-rw-r--r--conf/distro/include/imx6qsabresd.conf2
-rw-r--r--conf/distro/include/nitrogen6x.conf2
-rw-r--r--conf/distro/include/toradex.inc3
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb2
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb3
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb4
-rw-r--r--recipes-qt/qt5-addons/qtquickcompiler_3.0.bb (renamed from recipes-qt/qt5-addons/qtquickcompiler_2.0.bb)10
-rw-r--r--recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb2
-rw-r--r--recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri2
-rw-r--r--recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri3
-rw-r--r--scripts/manifest_qt5.xml2
15 files changed, 26 insertions, 15 deletions
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 @@
21############################################################################# 21#############################################################################
22 22
23include conf/distro/include/toradex.inc 23include conf/distro/include/toradex.inc
24include conf/distro/include/imx6.inc
24 25
25KERNEL_IMAGETYPE = "uImage" 26KERNEL_IMAGETYPE = "uImage"
26 27
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 @@
21############################################################################# 21#############################################################################
22 22
23include conf/distro/include/toradex.inc 23include conf/distro/include/toradex.inc
24include conf/distro/include/imx6.inc
24 25
25KERNEL_IMAGETYPE = "uImage" 26KERNEL_IMAGETYPE = "uImage"
26 27
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 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23include conf/distro/include/imx6.inc
24
23BOOTFS_CONTENT = "\ 25BOOTFS_CONTENT = "\
24 u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ 26 u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
25 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ 27 ${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 @@
1BBMASK ?= " "
2BBMASK .= "|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 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23include conf/distro/include/imx6.inc
24
23BOOTFS_CONTENT = "\ 25BOOTFS_CONTENT = "\
24 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ 26 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
25 ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ 27 ${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 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23include conf/distro/include/imx6.inc
24
23BOOTFS_CONTENT = "\ 25BOOTFS_CONTENT = "\
24 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ 26 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
25 ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ 27 ${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 @@
1BBMASK += "|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" 1BBMASK ?= " "
2BBMASK .= "|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"
29 29
30RDEPENDS_${PN} += " \ 30RDEPENDS_${PN} += " \
31 qtdatavisualization \ 31 qtdatavisualization \
32 qtquickenterprisecontrols \
33 qtquickenterprisecontrols-fonts \
34 qtcharts \ 32 qtcharts \
35 qtvirtualkeyboard \ 33 qtvirtualkeyboard \
36 b2qt-appcontroller \ 34 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} += " \
36 qt3d-dev \ 36 qt3d-dev \
37 qtbase-dev \ 37 qtbase-dev \
38 qtbase-staticdev \ 38 qtbase-staticdev \
39 qtcanvas3d \
39 qtconnectivity-dev \ 40 qtconnectivity-dev \
40 qtdeclarative-dev \ 41 qtdeclarative-dev \
41 qtdeclarative-staticdev \ 42 qtdeclarative-staticdev \
@@ -50,9 +51,9 @@ RDEPENDS_${PN} += " \
50 qttools-dev \ 51 qttools-dev \
51 qttools-staticdev \ 52 qttools-staticdev \
52 ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ 53 ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
54 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
53 qtwebsockets-dev \ 55 qtwebsockets-dev \
54 qtwebchannel-dev \ 56 qtwebchannel-dev \
55 qtxmlpatterns-dev \ 57 qtxmlpatterns-dev \
56 qtquickcontrols-dev \ 58 qtquickcontrols-dev \
57 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
58 " 59 "
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
28PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" 28PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
29 29
30RDEPENDS_${PN} += " \ 30RDEPENDS_${PN} += " \
31 qt3d \
31 qtbase \ 32 qtbase \
32 qtbase-fonts \ 33 qtbase-fonts \
34 qtcanvas3d \
33 qtconnectivity \ 35 qtconnectivity \
34 qtdeclarative \ 36 qtdeclarative \
35 qtdeclarative-tools \ 37 qtdeclarative-tools \
@@ -41,8 +43,8 @@ RDEPENDS_${PN} += " \
41 qtserialport \ 43 qtserialport \
42 qtsvg \ 44 qtsvg \
43 ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ 45 ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
46 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
44 qtwebsockets \ 47 qtwebsockets \
45 qtxmlpatterns \ 48 qtxmlpatterns \
46 qtquickcontrols \ 49 qtquickcontrols \
47 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
48 " 50 "
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
index fd7e8be..6f9fa30 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
@@ -27,15 +27,15 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca
27inherit qt5-module 27inherit qt5-module
28 28
29SRC_URI = " \ 29SRC_URI = " \
30 git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${QT_BRANCH};protocol=ssh;name=compiler;destsuffix=git \ 30 git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \
31 git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${QT_BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ 31 git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \
32 " 32 "
33 33
34SRCREV_compiler = "60c13275dec85d8224ea5826ae5533d87c65e76e" 34SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e"
35QT_BRANCH_compiler = "2.0" 35BRANCH_compiler = "3.0"
36 36
37SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" 37SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea"
38QT_BRANCH_sdk = "master" 38BRANCH_sdk = "master"
39 39
40S = "${WORKDIR}/git" 40S = "${WORKDIR}/git"
41 41
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 = " \
32 git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ 32 git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \
33 " 33 "
34 34
35SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97" 35SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95"
36QT_BRANCH = "master" 36QT_BRANCH = "master"
37 37
38S = "${WORKDIR}/git" 38S = "${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
5QMAKE_CFLAGS += $$IMX6_CFLAGS 5QMAKE_CFLAGS += $$IMX6_CFLAGS
6QMAKE_CXXFLAGS += $$IMX6_CFLAGS 6QMAKE_CXXFLAGS += $$IMX6_CFLAGS
7 7
8EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-imx6-g++/qeglfshooks_imx6.cpp 8EGLFS_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
6QMAKE_CFLAGS += $$RPI_CFLAGS 6QMAKE_CFLAGS += $$RPI_CFLAGS
7QMAKE_CXXFLAGS += $$RPI_CFLAGS 7QMAKE_CXXFLAGS += $$RPI_CFLAGS
8 8
9EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp 9EGLFS_DEVICE_INTEGRATION = eglfs_brcm
10EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host
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 @@
7 7
8 <project name="meta-qt5" 8 <project name="meta-qt5"
9 remote="playground" 9 remote="playground"
10 revision="5.4" 10 revision="5.5"
11 path="sources/meta-qt5"/> 11 path="sources/meta-qt5"/>
12 12
13</manifest> 13</manifest>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 00:54:38 +0000