From 3b0cf4eb768820ef2fc01f27cc23ee507f6aa313 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 28 Sep 2020 10:28:53 +0200
Subject: [PATCH] qtbase: use platform-specific qt5.sh scripts instead of
 backend-specific ones

We have specific scripts per platform to export the qt5 environment variables,
because using the default backend-specific scripts ported from the meta-imx
layer results in mismatches in specific cases (for example, 6UL framebuffer
images only support linuxfb, but the qt5-fb.sh script exports eglfs instead).

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh      |  2 --
 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh |  2 --
 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh     |  2 --
 meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend     | 10 +++-------
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh
 delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh
 delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh

diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh
deleted file mode 100644
index 34fa033af..000000000
--- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export QT_QPA_PLATFORM=eglfs
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh
deleted file mode 100644
index 6779c9d12..000000000
--- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export QT_QPA_PLATFORM=wayland
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh
deleted file mode 100644
index 8bbd73b94..000000000
--- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export QT_QPA_PLATFORM=xcb
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
index aebffbf37..c1ed65746 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
@@ -6,13 +6,9 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-IMX_BACKEND = \
-    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',\
-        bb.utils.contains('DISTRO_FEATURES',     'x11',     'x11', \
-                                                             'fb', d), d)}"
-
+# Digi: we use a custom script per platform, not per backend like NXP does
 SRC_URI_append = " \
-    file://qt5-${IMX_BACKEND}.sh \
+    file://qt5.sh \
 "
 SRC_URI_append_imxgpu3d = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \
@@ -52,7 +48,7 @@ do_install_append () {
         sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
     fi
     install -d ${D}${sysconfdir}/profile.d/
-    install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/qt5.sh
+    install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/qt5.sh
 }
 
 FILES_${PN} += "${sysconfdir}/profile.d/qt5.sh"