From 3caf64adda08bd99e920d157c181b85505c8ad4d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 20 Feb 2025 16:09:59 +0100 Subject: [PATCH] Revert "CMake: Stop-gap fix for Qml user projects" The issue was fixed by commit 3b0dab39d047cfc676a75915ce606cbd4d43a83d in qtdeclarative. This reverts commit 4d95b6dccdd7772594bdb5f0c404585f16a4dc9c. Change-Id: Ic7d78e740d1789a4ebd1d4c8c91d18846e005dfe Reviewed-by: Alexandru Croitor --- cmake/QtModuleHelpers.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index ce8659bef67..485d510b98e 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -1027,10 +1027,6 @@ function(qt_internal_write_basic_module_package target target_private) endif() endif() - ### Temporary measure to fix QtQml user projects. Remove, once - ### https://codereview.qt-project.org/c/qt/qtdeclarative/+/620337 is merged. - set(always_load_private_module ON) - if(arg_IS_STATIC_LIB AND NOT arg_PRIVATE AND CMAKE_VERSION VERSION_LESS "3.26") # We auto-load the private module package from the public module package if we have a static # Qt module and CMake's version is < 3.26. This is needed for the case "Qt6Foo links against