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

qtdeclarative: fix test builds

Browse Source 
Revert commit that causes ptest build to fail when QmlCompiler is used:
ld.gold: error: [...]/recipe-sysroot-native/usr/lib/libQt6QmlCompiler.so.6.5.0: incompatible target

Change-Id: Ief349b65f59d57c5e0299adb4304278f70da3578
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 810f41bd6a)
This commit is contained in:
Samuli Piippo 2022-08-09 06:29:58 +00:00
parent 2a5200e485
commit 94cda9406e
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
recipes-qt/qt6/qtdeclarative/0001-Revert-Make-find_package-for-qmlsc-look-only-in-host.patch Normal file
View File

@ -0,0 +1,39 @@
From 522a2f805ab67e6272bf5e6338fad6de1033c437 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 9 Aug 2022 05:27:53 +0000
Subject: [PATCH] Revert "Make find_package for qmlsc look only in host qt"
This reverts commit 9d16facde09d7bc9c16f832f3d46cb6e01cda0cc.
---
src/qml/Qt6QmlFindQmlscInternal.cmake | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/qml/Qt6QmlFindQmlscInternal.cmake b/src/qml/Qt6QmlFindQmlscInternal.cmake
index 459bf42928..d2470766fe 100644
--- a/src/qml/Qt6QmlFindQmlscInternal.cmake
+++ b/src/qml/Qt6QmlFindQmlscInternal.cmake
@@ -3,23 +3,6 @@ if (QT_NO_FIND_QMLSC)
endif()
set(QT_NO_FIND_QMLSC TRUE)
-if(NOT "${QT_HOST_PATH}" STREQUAL "")
- # Make sure that the tools find the host tools and does not try the target
- set(BACKUP_qmlsc_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
- set(BACKUP_qmlsc_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
- set(BACKUP_qmlsc_CMAKE_SYSROOT ${CMAKE_SYSROOT})
- set(CMAKE_PREFIX_PATH "${QT_HOST_PATH_CMAKE_DIR}")
- list(APPEND CMAKE_PREFIX_PATH "${_qt_additional_host_packages_prefix_paths}")
- set(CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}")
- list(APPEND CMAKE_FIND_ROOT_PATH "${_qt_additional_host_packages_root_paths}")
- unset(CMAKE_SYSROOT)
-endif()
+# FIXME: Make this work with cross-builds
find_package(Qt6QmlCompilerPlusPrivate QUIET)
-
-if(NOT "${QT_HOST_PATH}" STREQUAL "")
- set(CMAKE_PREFIX_PATH ${BACKUP_qmlsc_CMAKE_PREFIX_PATH})
- set(CMAKE_FIND_ROOT_PATH ${BACKUP_qmlsc_CMAKE_FIND_ROOT_PATH})
- set(CMAKE_SYSROOT ${BACKUP_qmlsc_CMAKE_SYSROOT})
-endif()
-

1
recipes-qt/qt6/qtdeclarative_git.bb
View File

@ -14,6 +14,7 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-tests-disable-failing-tests.patch \
file://0001-Revert-Make-find_package-for-qmlsc-look-only-in-host.patch \
"
DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"