aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch')
-rw-r--r--recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch b/recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch
deleted file mode 100644
index 7aa108e..0000000
--- a/recipes-qt/qt6/qtbase/0004-Do-not-use-QT_TOOLCHAIN_RELOCATABLE-paths-in-qt.tool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c15033fd4df14b08fc28ec8da61c990801c7e411 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 16 Dec 2021 13:10:48 +0200
-Subject: [PATCH] Do not use QT_TOOLCHAIN_RELOCATABLE paths in
- qt.toolchain.cmake
-
-The calculated paths for QT_TOOLCHAIN_RELOCATABLE paths point to
-host sysroot which must not be used when cross-compiling other projects.
-
-Upstream-Status: Inappropriate [embedded specific]
----
- cmake/qt.toolchain.cmake.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
-index 5e9acd66b8..451de99633 100644
---- a/cmake/qt.toolchain.cmake.in
-+++ b/cmake/qt.toolchain.cmake.in
-@@ -68,8 +68,8 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_
- # Instead of collapsing the search prefix (which is the case when one is a subdir of the other),
- # it concatenates them creating an invalid path. Workaround it by setting the root path to the
- # Qt install prefix, and the prefix path to the lib/cmake subdir.
--list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
--list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
-+#list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
-+#list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
-
- # Let CMake load our custom platform modules.
- # CMake-provided platform modules take precedence.