1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "CMake: Stop-gap fix for Qml user projects"

Browse Source 
The issue was fixed by commit
3b0dab39d047cfc676a75915ce606cbd4d43a83d in qtdeclarative.

This reverts commit 4d95b6dccdd7772594bdb5f0c404585f16a4dc9c.

Change-Id: Ic7d78e740d1789a4ebd1d4c8c91d18846e005dfe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2025-02-20 16:09:59 +01:00
parent bf272ce4ad
commit 3caf64adda
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtModuleHelpers.cmake
View File

@ -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