diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-15 13:09:57 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-18 23:18:26 +0200 |
| commit | 3329212815777e33dfb4697b748d10927d73f44c (patch) | |
| tree | 0140f48a9c145d22f7c080633f70a70930123b7c /tests | |
| parent | df316963213e765de5b94469622df48b0c9a9e6e (diff) | |
Move the linking logic of the object libraries to a common function
The linking logic of object libraries should be reusable outside of the
resource context. This introduces a
__qt_internal_propagate_object_library function that prepares all the
necessary genexes to link and propagate the object library to the
end-point executable.
Rename resource object finalizer API to make the naming more generic
to object libraries of any kind.
Amends 5fb99e3860eb43f4bacacec7f4a4626cb0159b14
Pick-to: 6.2
Task-number: QTBUG-93002
Task-number: QTBUG-94528
Change-Id: I69d0f34c0dadbd67232de91035aaa53af93d1fa1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt b/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt index 58a7c4147a..43363fa495 100644 --- a/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt @@ -81,7 +81,7 @@ if(NOT link_order_matters) if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.19) qt_add_executable(test_static_resources_propagation_not_finalize main.cpp) - qt6_enable_resource_objects_finalizer_mode( + qt6_enable_object_libraries_finalizer_mode( test_static_resources_propagation_not_finalize FALSE ) set_target_properties(test_static_resources_propagation_not_finalize PROPERTIES |