From fc9a4a5423aad5d6e910b23227e6d4b1e71ff29f Mon Sep 17 00:00:00 2001 From: vasilito Date: Sat, 20 Jun 2026 16:22:16 +0300 Subject: [PATCH] qtdeclarative: remove broken OPTIONS patch, revert to original CMakeLists --- local/recipes/qt/qtdeclarative/recipe.toml | 4 ---- .../qtdeclarative/source/src/qmltyperegistrar/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/local/recipes/qt/qtdeclarative/recipe.toml b/local/recipes/qt/qtdeclarative/recipe.toml index 37bfe8e647..f7c5479a87 100644 --- a/local/recipes/qt/qtdeclarative/recipe.toml +++ b/local/recipes/qt/qtdeclarative/recipe.toml @@ -130,10 +130,6 @@ fi rm -f CMakeCache.txt rm -rf CMakeFiles -# Fix: qt_internal_add_resource creates empty targets in cross-compilation -# We patch the qmltyperegistrar CMakeLists to add OPTIONS --no-compress -python "${COOKBOOK_RECIPE}/patch-resource.py" - redbear_qt_link_sysroot_dirs "${COOKBOOK_SYSROOT}" plugins mkspecs metatypes modules # Patch masm/CheckedArithmetic.h: add missing ArithmeticOperations diff --git a/local/recipes/qt/qtdeclarative/source/src/qmltyperegistrar/CMakeLists.txt b/local/recipes/qt/qtdeclarative/source/src/qmltyperegistrar/CMakeLists.txt index e1f2b48719..6d4fc7e825 100644 --- a/local/recipes/qt/qtdeclarative/source/src/qmltyperegistrar/CMakeLists.txt +++ b/local/recipes/qt/qtdeclarative/source/src/qmltyperegistrar/CMakeLists.txt @@ -27,6 +27,8 @@ qt_internal_add_module(QmlTypeRegistrarPrivate ) qt_internal_add_resource(QmlTypeRegistrarPrivate "jsRootMetaTypes" + OPTIONS + --no-compress PREFIX "/qt-project.org/meta_types" FILES