From e3deb80e593ecd6faf07ea1e5dcfe798248ecbe5 Mon Sep 17 00:00:00 2001
From: Valek Andrej <andrej.v@skyrain.eu>
Date: Tue, 28 May 2024 11:25:31 +0200
Subject: [PATCH] qt6: do not mix bitbake's and shell variables

Change-Id: If8eae76571574d9e6a98a591e8b9f03537c0670d
Signed-off-by: Valek Andrej <andrej.v@skyrain.eu>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 classes/qt6-qmake.bbclass    | 2 +-
 recipes-qt/qt6/qtbase_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass
index 5c3f06d..9a115c6 100644
--- a/classes/qt6-qmake.bbclass
+++ b/classes/qt6-qmake.bbclass
@@ -82,7 +82,7 @@ inherit qt6-paths remove-libtool
 
 generate_target_qt_config_file() {
     qtconf="$1"
-    cat > "${qtconf}" <<EOF
+    cat > "$qtconf" <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
 Headers = ${OE_QMAKE_PATH_HEADERS}
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 353919b..cf1d65d 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -200,7 +200,7 @@ do_install:append() {
     install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
     RELPATH=${@os.path.relpath(d.getVar('prefix'), d.getVar('datadir') + '/cmake/OEToolchainConfig.cmake.d')}
     cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
-get_filename_component(QT_HOST_PATH "\${CMAKE_CURRENT_LIST_DIR}/${RELPATH}" ABSOLUTE CACHE)
+get_filename_component(QT_HOST_PATH "\${CMAKE_CURRENT_LIST_DIR}/$RELPATH" ABSOLUTE CACHE)
 set(QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX ON CACHE BOOL "")
 EOF