summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiago De Franco <hiago.franco@toradex.com>2025-02-03 13:19:21 -0300
committerHiago De Franco <hiago.franco@toradex.com>2025-02-04 13:03:52 -0300
commitb73e51d8fb362cc43569ed4e17b0faf18c8dabae (patch)
treec8efe31ecedfb8f5dd08a058495324d69cd8514a
parent1f6cd8bc2099811aa80cb09350b73a40e9b8c3ce (diff)
qt5: Remove all recipes related to Qt 5 and set weston-simple-egl as default app
Qt 5 has reached end-of-life and is being removed from Toradex Layers. The Toradex Reference Multimedia Image now features the Weston desktop by default with the weston-simple-egl client, replacing the previous Qt Cinematic Experience demo. Related-to: ELB-6229 Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
-rw-r--r--qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch44
-rw-r--r--qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend3
-rw-r--r--qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend1
-rw-r--r--qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb26
-rw-r--r--qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch52
-rw-r--r--qt5-layer/recipes-qt/qt5/qt3d_%.bbappend13
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase/qt5-fb.sh2
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase/qt5-wayland.sh3
-rw-r--r--qt5-layer/recipes-qt/qt5/qtbase_%.bbappend37
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb8
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb8
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb8
-rw-r--r--recipes-images/images/packagegroup-tdx-qt5.bb90
-rw-r--r--recipes-images/images/tdx-reference-multimedia-image.bb12
14 files changed, 2 insertions, 305 deletions
diff --git a/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch b/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch
deleted file mode 100644
index 4bb069f..0000000
--- a/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Pending
---- a/main.cpp 2022-11-16 15:25:11.221100107 +0100
-+++ b/main.cpp 2022-11-18 09:30:01.084064039 +0100
-@@ -1,5 +1,22 @@
- #include <QGuiApplication>
- #include <QQuickView>
-+#include <QScreen>
-+
-+void setFullscreen(QQuickView *view, const QScreen *screen)
-+{
-+ QSize screenSize = screen->size();
-+ /* If we set fullscreen and screen size is 0,0 the application crashes.
-+ * Therefore, we only set fullscreen mode when the screen size is big enough.
-+ * We have to set visible false before we change the window state, else it
-+ * won't update correctly and we might have a title bar */
-+ if ((screenSize.height() > 1) && (screenSize.width() > 1)) {
-+ view->setVisible(false);
-+ view->setWindowStates(Qt::WindowFullScreen);
-+ }
-+
-+ /* We always need to set visible to true, else the window will not show up */
-+ view->setVisible(true);
-+}
-
- int main(int argc, char* argv[])
- {
-@@ -10,9 +27,15 @@
-
- const QString lowerArgument = QString::fromLatin1(argv[1]).toLower();
- if (lowerArgument == QLatin1String("--fullscreen")) {
-- view.showFullScreen();
-- } else {
-+ QObject::connect(&view, &QQuickView::screenChanged, &app, [&view](QScreen *screen) {
-+ setFullscreen(&view, screen);
-+ }, Qt::DirectConnection);
-+
-+ setFullscreen(&view, view.screen());
-+ }
-+ else {
- view.show();
- }
-+
- return app.exec();
- }
diff --git a/qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend b/qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend
deleted file mode 100644
index e4d42f4..0000000
--- a/qt5-layer/recipes-qt/examples/cinematicexperience_1.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI:append = " file://fix-fullscreen-mode.patch"
diff --git a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
deleted file mode 100644
index c58fcf2..0000000
--- a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS:${PN} += "nativesdk-python3-json"
diff --git a/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
deleted file mode 100644
index 222e970..0000000
--- a/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "QT5 base package group"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit packagegroup
-
-RDEPENDS:${PN} = " \
- qtbase \
- qtbase-tools \
- qtmultimedia \
- qtsvg \
- qtsensors \
- qtsystems \
- qtsystems-tools \
- qtscript \
- qtgraphicaleffects-qmlplugins \
- qtconnectivity-qmlplugins \
- qtlocation-plugins \
- qtlocation-qmlplugins \
- qtdeclarative \
- ${QTWEBKIT} \
-"
-
-QTWEBKIT ??= "\
- qtwebkit \
-"
diff --git a/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch b/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch
deleted file mode 100644
index 225d858..0000000
--- a/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6d58507157d88160310545e2aedd91be311ae1d5 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Tue, 15 Jan 2019 09:30:12 +0000
-Subject: [PATCH] qt3d: do not set resources_big
-
-resources_big enables rcc's two pass mode.
-In an OE setup there seem to be a race condition which makes the build fail with
-the following error messages (with changing build targets):
-
-| No data signature found
-| make[3]: *** [Makefile:458: .rcc/qrc_controls.o] Error 1
-| make[3]: Leaving directory '.../build/examples/qt3d/controls'
-
-see also:
-https://bugreports.qt.io/browse/QTBUG-41301?focusedCommentId=255692&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel
-(the default is now 1 pass and 2 pass needs to be configured in CONFIG with ressource_big)
-
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- examples/qt3d/examples.pri | 2 +-
- examples/qt3d/planets-qml/planets-qml.pro | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/examples/qt3d/examples.pri b/examples/qt3d/examples.pri
-index 621b1473c..7d9a75073 100644
---- a/examples/qt3d/examples.pri
-+++ b/examples/qt3d/examples.pri
-@@ -1,7 +1,6 @@
- TEMPLATE = app
-
- QT += 3dextras
--CONFIG += resources_big
-
- target.path = $$[QT_INSTALL_EXAMPLES]/qt3d/$$TARGET
- INSTALLS += target
-diff --git a/examples/qt3d/planets-qml/planets-qml.pro b/examples/qt3d/planets-qml/planets-qml.pro
-index de14ecc8a..a66712928 100644
---- a/examples/qt3d/planets-qml/planets-qml.pro
-+++ b/examples/qt3d/planets-qml/planets-qml.pro
-@@ -8,7 +8,7 @@ QT += qml quick \
- 3dquick 3dquickrender 3dquickinput 3dquickextras \
- network
-
--CONFIG += resources_big c++11
-+CONFIG += c++11
-
- HEADERS += \
- networkcontroller.h
---
-2.13.6
-
diff --git a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
deleted file mode 100644
index eb597ea..0000000
--- a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/qt3d:"
-
-# qt3d links against the opengl flavours we configured qtbase for, so
-# depend on them here
-DEPENDS_GLES = ""
-DEPENDS_GLES:imxpxp += "virtual/libgles2 virtual/egl"
-DEPENDS_GLES_imgpu3d += "virtual/libgles2 virtual/egl"
-DEPENDS_GLES:upstream += "virtual/libgles2 virtual/egl"
-
-DEPENDS:class-target += " ${DEPENDS_GLES}"
-
-# Fix race condition
-SRC_URI += "file://0001-qt3d-do-not-set-resources_big.patch"
diff --git a/qt5-layer/recipes-qt/qt5/qtbase/qt5-fb.sh b/qt5-layer/recipes-qt/qt5/qtbase/qt5-fb.sh
deleted file mode 100644
index 34fa033..0000000
--- a/qt5-layer/recipes-qt/qt5/qtbase/qt5-fb.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export QT_QPA_PLATFORM=eglfs
diff --git a/qt5-layer/recipes-qt/qt5/qtbase/qt5-wayland.sh b/qt5-layer/recipes-qt/qt5/qtbase/qt5-wayland.sh
deleted file mode 100644
index 886d7c3..0000000
--- a/qt5-layer/recipes-qt/qt5/qtbase/qt5-wayland.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export QT_QPA_PLATFORM=wayland-egl
-
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
deleted file mode 100644
index f50d3f1..0000000
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ /dev/null
@@ -1,37 +0,0 @@
-PACKAGECONFIG_EXAMPLES ?= "examples"
-
-# | /build/krm/oe-core_V2.6/build/out-glibc/work/armv7at2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp: In member function 'virtual QRect QGtkStyle::subControlRect(QStyle::ComplexControl, const QStyleOptionComplex*, QStyle::SubControl, const QWidget*) const':
-# | /build/krm/oe-core_V2.6/build/out-glibc/work/armv7at2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:24: error: 'isInstanceOf' is not a member of 'QStyleHelper'
-# | } else if (QStyleHelper::isInstanceOf(groupBox->styleObject, QAccessible::Grouping)) {
-# | ^
-# | /build/krm/oe-core_V2.6/build/out-glibc/work/armv7at2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:74: error: 'QAccessible' has not been declared
-# | } else if (QStyleHelper::isInstanceOf(groupBox->styleObject, QAccessible::Grouping)) {
-
-PACKAGECONFIG:append = " accessibility"
-PACKAGECONFIG:append = " sql-sqlite"
-
-PACKAGECONFIG_FONTS:append = " fontconfig"
-
-#qtbase must be configured with icu for qtwebkit
-PACKAGECONFIG:append = " \
- icu \
- ${PACKAGECONFIG_EXAMPLES} \
-"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-IMX_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
- bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
- 'fb', d), d)}"
-
-SRC_URI:append = " \
- file://qt5-${IMX_BACKEND}.sh \
-"
-
-do_install:append () {
- install -d ${D}${sysconfdir}/profile.d/
- install -m 0755 ${UNPACKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/
-
-}
-
-FILES:${PN} += "${sysconfdir}/profile.d/qt5*.sh"
diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb
deleted file mode 100644
index 73c7dd1..0000000
--- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# set the following variable to your one and only application which should
-# be launched right after weston started
-
-INITIAL_APP_PKGS ?= "qtbase-examples qtwayland"
-APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl'
-WAYLAND_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock"
-
-require wayland-app-launch.inc
diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb
deleted file mode 100644
index 7eff903..0000000
--- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# set the following variable to your one and only application which should
-# be launched right after weston started
-
-INITIAL_APP_PKGS ?= "cinematicexperience qtwayland"
-APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl'
-WAYLAND_APPLICATION ?= "/usr/share/cinematicexperience-1.0/Qt5_CinematicExperience --fullscreen"
-
-require wayland-app-launch.inc
diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb
deleted file mode 100644
index 2e1a2b0..0000000
--- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# set the following variable to your one and only application which should
-# be launched right after weston started
-
-INITIAL_APP_PKGS ?= "qtsmarthome qtwayland"
-APPLICATION_ENVIRONMENT ?= 'QT_QPA_PLATFORM=wayland-egl'
-WAYLAND_APPLICATION ?= "/usr/share/qtsmarthome-1.0/smarthome"
-
-require wayland-app-launch.inc
diff --git a/recipes-images/images/packagegroup-tdx-qt5.bb b/recipes-images/images/packagegroup-tdx-qt5.bb
deleted file mode 100644
index 3d4f94d..0000000
--- a/recipes-images/images/packagegroup-tdx-qt5.bb
+++ /dev/null
@@ -1,90 +0,0 @@
-SUMMARY = "Packagegroup which provides most QT5 libraries and a QT5 demo"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES += " \
- ${PN}-demos \
- ${PN}-fonts \
- ${PN}-libs \
-"
-
-RRECOMMENDS:${PN} = " \
- ${PN}-demos \
- ${PN}-fonts \
- ${PN}-libs \
-"
-# Only install qtbase-examples with its dependencies on modules with limited
-# storage and no gpu.
-RRECOMMENDS:${PN}:colibri-imx6ull = " \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
- qtbase-examples \
-"
-RRECOMMENDS:${PN}:colibri-imx6ull-emmc = " \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
- qtbase-examples \
-"
-RRECOMMENDS:${PN}:colibri-imx7 = " \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
- qtbase-examples \
-"
-
-SUMMARY:${PN}-demos = "QT5 Demos"
-RRECOMMENDS:${PN}-demos = " \
- cinematicexperience \
- qtsmarthome \
-"
-
-SUMMARY:${PN}-fonts = "Some fonts useful for QT5"
-RRECOMMENDS:${PN}-fonts = " \
- ttf-dejavu-common \
- ttf-dejavu-sans \
- ttf-dejavu-sans-mono \
- ttf-dejavu-serif \
-"
-
-SUMMARY:${PN}-libs = "QT5 libraries"
-RRECOMMENDS:${PN}-libs = " \
- qt3d \
- qt5ledscreen \
- qtbase \
- qtcharts \
- qtcoap \
- qtconnectivity \
- qtdatavis3d \
- qtdeclarative \
- qtgamepad \
- qtgraphicaleffects \
- qtimageformats \
- qtknx \
- qtlocation \
- qtlottie \
- qtmqtt \
- qtmultimedia \
- qtnetworkauth \
- qtopcua \
- qtpurchasing \
- qtquick3d \
- qtquickcontrols \
- qtquickcontrols2 \
- qtquicktimeline \
- qtremoteobjects \
- qtscript \
- qtscxml \
- qtsensors \
- qtserialbus \
- qtserialport \
- qtsvg \
- qtsystems \
- qttools \
- qttranslations \
- qtvirtualkeyboard \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
- qtwebchannel \
- qtwebglplugin \
- qtwebsockets \
- qtxmlpatterns \
-"
-
diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb
index bd7b43c..1494016 100644
--- a/recipes-images/images/tdx-reference-multimedia-image.bb
+++ b/recipes-images/images/tdx-reference-multimedia-image.bb
@@ -1,9 +1,7 @@
require tdx-reference-minimal-image.bb
SUMMARY = "Toradex Embedded Linux Reference Multimedia Image"
-DESCRIPTION = "Image for BSP verification with QT and multimedia features"
-
-inherit populate_sdk_qt5
+DESCRIPTION = "Image for BSP verification with multimedia features"
#Prefix to the resulting deployable tarball name
export IMAGE_BASENAME = "Reference-Multimedia-Image"
@@ -12,12 +10,7 @@ IMAGE_FEATURES += " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', '', d)} \
"
-APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience"
-APP_LAUNCH_WAYLAND:colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock"
-APP_LAUNCH_WAYLAND:colibri-imx6ull-emmc ?= "wayland-qtdemo-launch-analogclock"
-APP_LAUNCH_WAYLAND:colibri-imx7 ?= "wayland-qtdemo-launch-analogclock"
-APP_LAUNCH_WAYLAND:colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock"
-APP_LAUNCH_WAYLAND:verdin-am62 ?= "wayland-qtdemo-launch-analogclock"
+APP_LAUNCH_WAYLAND ?= "weston-simple-egl-launch"
IMAGE_INSTALL += " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
@@ -28,7 +21,6 @@ IMAGE_INSTALL += " \
\
packagegroup-tdx-cli \
packagegroup-tdx-graphical \
- packagegroup-tdx-qt5 \
packagegroup-fsl-isp \
\
bash \