From 7d1d6a11af843b15f2cc803546e1fdfaf431ab20 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Aug 2022 06:32:07 +0000 Subject: [PATCH] qtbase: remove initial host path from CMake files Amend 0b55d8ec947e80a7781144013e2c62426b509624 and remove the initial host paths from CMake files. They point to the temporary build paths and cause build breaks in declarative builds. Pick-to: 6.4 Change-Id: I17d46b989f024e71ec617ff130c8ea7d7fc85641 Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qtbase_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index dfb7e9e..b4a80cb 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -152,6 +152,9 @@ do_install:append() { sed -i ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \ -e '/QT_SOURCE_TREE/,+2d' + sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6/Qt6Dependencies.cmake \ + -e '/set(__qt_platform_initial_qt_host/d' + # remove mac and android specific scripts that depend on perl and bash # to avoid file-rdeps QA Issue. rm -f ${D}${QT6_INSTALL_LIBEXECDIR}/android_emulator_launcher.sh