deleted file mode 100644
@@ -1,20 +0,0 @@
-# Class to mimic the old qt4e to prep recipe for use with Qt5 libraries
-
-QT5EDEPENDS ?= "qtbase "
-DEPENDS:prepend = "${QT5EDEPENDS}"
-
-inherit qmake5
-
-# we don't want conflicts with qt4
-OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
-OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"
-OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}"
-OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}"
-OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}"
-OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}"
-OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
-OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
-OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
-
-# Qt uses atomic instructions not supported in thumb mode
-ARM_INSTRUCTION_SET = "arm"
@@ -2,7 +2,12 @@ SUMMARY = "HMI demo for electronic vehicle charging station (EVSE) using QT QWid
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=a9cde3921a8be42ed79ab74661799104"
-inherit qt5
+DEPENDS += "qtbase"
+
+inherit qmake5
+
+# Qt uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
PV = "1.0"
PR = "r1"
@@ -2,7 +2,10 @@ SUMMARY = "Gesture baed HMI demo using mmWave IWR1642 chip and Sitara AM device"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=e7e749ff1989b18db836e5d9910a37e9"
-inherit qt5
+inherit qmake5
+
+# Qt uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
PV = "1.0"
PR = "r0"
@@ -2,7 +2,10 @@ SUMMARY = "Predictive maintenance demo for anomaly detection using Recurrent Neu
LICENSE = "BSD-3-Clause & MIT & GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e88016d2cbc82d0d2efbb0865891e9d6"
-inherit qt5
+inherit qmake5
+
+# Qt uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
PV = "1.0"
PR = "r2"
@@ -2,7 +2,12 @@ SUMMARY = "HMI demo for Protection Relays using QT tools"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=a9cde3921a8be42ed79ab74661799104"
-inherit qt5
+DEPENDS += "qtbase"
+
+inherit qmake5
+
+# Qt uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
PV = "1.0"
PR = "r0"
@@ -18,7 +18,10 @@ SRCREV = "a09ec269e8b296d39d78b45ae251edb3d7bada41"
S = "${WORKDIR}/git"
-inherit qt5
+inherit qmake5
+
+# Qt uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
do_install() {
install -d ${D}${bindir}
@@ -1,6 +1,3 @@
-# Set preferred Qt5 versions. Different namespace from Qt4, so no conflict
-include conf/distro/include/qt5-versions.inc
-
# Use the latest version of ltp-ddt for kernel versions 3.8+
PREFERRED_PROVIDER_ltp-ddt = "ltp-ddt"
This was used for selecting between QT4 and QT5, this is no longer needed as everything is QT5. As we start to prepare for QT6 let's clean out some of these old QT4 migration items. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-arago-demos/classes/qt5.bbclass | 20 ------------------- .../recipes-apps/evse-hmi/evse-hmi_git.bb | 7 ++++++- .../mmwavegesture-hmi_git.bb | 5 ++++- .../pdm-anomaly-detection_git.bb | 5 ++++- .../protection-relays-hmi_git.bb | 7 ++++++- .../examples/qtwebbrowser_5.15.1.bb | 5 ++++- .../conf/distro/include/arago-prefs.inc | 3 --- 7 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 meta-arago-demos/classes/qt5.bbclass