diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-17 17:51:42 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-19 06:29:17 +0100 |
| commit | 10a2a1c46e766985f28db82d17852b634a7d6504 (patch) | |
| tree | 8cbe578c072e5f8d93186ae95382e50f4dd53d21 /cmake | |
| parent | b233b5f31e19dd5c2636790f2732e06f1b88a99f (diff) | |
CMake: Rename the qt resource properties to be internal
Use lowercase underscored property names. This ensures they will
continue to work even for INTERFACE libraries if it ever comes to
that.
Change-Id: I5281070f25c1eb9f591c79af8b7fa6169c7c0fb7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPrlHelpers.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtResourceHelpers.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake index d26b6135bf..2c0946ebad 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -115,7 +115,7 @@ function(qt_internal_walk_libs # Need to record the rcc object file info not only for dependencies, but also for # the current target too. Otherwise the saved information is incomplete for prl static # build purposes. - get_target_property(main_target_rcc_objects ${target} QT_RCC_OBJECTS) + get_target_property(main_target_rcc_objects ${target} _qt_rcc_objects) if(main_target_rcc_objects) qt_merge_libs(rcc_objects ${main_target_rcc_objects}) endif() @@ -190,7 +190,7 @@ function(qt_internal_walk_libs else() qt_merge_libs(libs "$<TARGET_FILE:${lib_target}>") - get_target_property(target_rcc_objects "${lib_target}" QT_RCC_OBJECTS) + get_target_property(target_rcc_objects "${lib_target}" _qt_rcc_objects) if(target_rcc_objects) qt_merge_libs(rcc_objects ${target_rcc_objects}) endif() diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake index e37cd03cd7..ff4f234306 100644 --- a/cmake/QtResourceHelpers.cmake +++ b/cmake/QtResourceHelpers.cmake @@ -28,7 +28,7 @@ endfunction() function(qt_internal_record_rcc_object_files target resource_targets) foreach(out_target ${resource_targets}) - get_target_property(resource_name ${out_target} QT_RESOURCE_NAME) + get_target_property(resource_name ${out_target} _qt_resource_name) if(NOT resource_name) continue() endif() @@ -43,7 +43,7 @@ function(qt_internal_record_rcc_object_files target resource_targets) # In a non-prefix build we use the object file paths right away. set(rcc_object_file_path $<TARGET_OBJECTS:$<TARGET_NAME:${out_target}>>) endif() - set_property(TARGET ${target} APPEND PROPERTY QT_RCC_OBJECTS "${rcc_object_file_path}") + set_property(TARGET ${target} APPEND PROPERTY _qt_rcc_objects "${rcc_object_file_path}") # Make sure that the target cpp files are compiled with the regular Qt internal compile # flags, needed for building iOS apps with qmake where bitcode is involved. |