CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt6: do not mix bitbake's and shell variables

Browse Source 
Change-Id: If8eae76571574d9e6a98a591e8b9f03537c0670d
Signed-off-by: Valek Andrej <andrej.v@skyrain.eu>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Valek Andrej 2024-05-28 11:25:31 +02:00
parent 6dabdc7782
commit e3deb80e59
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/qt6-qmake.bbclass
View File

@ -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}

2
recipes-qt/qt6/qtbase_git.bb
View File

@ -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