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

qtbase: don't force QT_HOST_PATH for SDK

Browse Source 
Set QT_HOST_PATH to the SDK path only if it has not already been set.
This allows using the SDK to rebuild Qt using different host Qt.

Task-number: QTBUG-92052
Change-Id: I39991ef6d95d0f9e21590dc8dccb39ec8107d8c7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit dfa089d0dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2021-04-06 15:00:10 +03:00 committed by Qt Cherry-pick Bot
parent 76043f9679
commit a37b0c904d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,8 +141,8 @@ do_install_append() {
do_install_append_class-nativesdk() {
install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "" FORCE)
set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "" FORCE)
set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "")
set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "")
EOF
}