From e3020055618b48b8427e570b2762a62d877687c5 Mon Sep 17 00:00:00 2001
From: Li Xinwei <1326710505@qq.com>
Date: Mon, 2 Aug 2021 18:16:38 +0800
Subject: [PATCH] Avoid to call _qt_internal_set_up_static_runtime_library()
 twice

Change-Id: I28985470b3e0b88befbbd2d62a027670d7d6c822
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a25144394910d07d0819c4da5aae058b0912a312)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/QtExecutableHelpers.cmake    | 1 +
 cmake/QtPublicPluginHelpers.cmake  | 3 +--
 cmake/QtResourceHelpers.cmake      | 1 -
 cmake/QtTargetHelpers.cmake        | 1 -
 qmake/CMakeLists.txt               | 3 +--
 src/tools/bootstrap/CMakeLists.txt | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
index ea3810f107e..c90eb2150c5 100644
--- a/cmake/QtExecutableHelpers.cmake
+++ b/cmake/QtExecutableHelpers.cmake
@@ -74,6 +74,7 @@ function(qt_internal_add_executable name)
     endif()
 
     qt_set_common_target_properties(${name})
+    _qt_internal_set_up_static_runtime_library(${name})
     if(ANDROID)
         # On our qmake builds we don't compile the executables with
         # visibility=hidden. Not having this flag set will cause the
diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake
index a765157f5fd..5023498b739 100644
--- a/cmake/QtPublicPluginHelpers.cmake
+++ b/cmake/QtPublicPluginHelpers.cmake
@@ -236,14 +236,13 @@ function(__qt_internal_add_static_plugin_init_object_library
 
     __qt_internal_get_static_plugin_init_target_name("${plugin_target}" plugin_init_target)
 
-    add_library("${plugin_init_target}" OBJECT "${generated_qt_plugin_file_name}")
+    qt6_add_library("${plugin_init_target}" OBJECT "${generated_qt_plugin_file_name}")
     target_link_libraries(${plugin_init_target}
         PRIVATE
 
         # Core provides the symbols needed by Q_IMPORT_PLUGIN.
         ${QT_CMAKE_EXPORT_NAMESPACE}::Core
     )
-    _qt_internal_set_up_static_runtime_library("${plugin_init_target}")
 
     set_property(TARGET ${plugin_init_target} PROPERTY _is_qt_plugin_init_target TRUE)
     set_property(TARGET ${plugin_init_target} APPEND PROPERTY
diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake
index 092b1123335..6e979e1d147 100644
--- a/cmake/QtResourceHelpers.cmake
+++ b/cmake/QtResourceHelpers.cmake
@@ -88,6 +88,5 @@ function(qt_internal_record_rcc_object_files target resource_targets)
         set_property(TARGET ${target} APPEND PROPERTY _qt_rcc_objects "${rcc_object_file_path}")
 
         qt_internal_link_internal_platform_for_object_library("${out_target}")
-        qt_set_common_target_properties(${out_target})
     endforeach()
 endfunction()
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
index 96d69823198..911f25a1ae1 100644
--- a/cmake/QtTargetHelpers.cmake
+++ b/cmake/QtTargetHelpers.cmake
@@ -188,7 +188,6 @@ function(qt_set_common_target_properties target)
             OBJCXX_VISIBILITY_PRESET hidden
             VISIBILITY_INLINES_HIDDEN 1)
     endif()
-    _qt_internal_set_up_static_runtime_library("${target}")
     qt_internal_set_compile_pdb_names("${target}")
 endfunction()
 
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index d35d981c99e..1ad10b950e8 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 # The common object library, that should be available regardless of the presence of qmake.
-add_library(QtLibraryInfo OBJECT
+qt_add_library(QtLibraryInfo OBJECT
     library/proitems.cpp library/proitems.h
     library/qmake_global.h
     property.cpp property.h
@@ -42,7 +42,6 @@ target_compile_definitions(QtLibraryInfo PUBLIC
     QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}"
     QT_HOST_DATADIR="${hostdatadir}"
 )
-qt_set_common_target_properties(QtLibraryInfo)
 
 # qmake is out of any module, so we manually evaluate the required features.
 include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 31bbd7c2e10..511313e9699 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -7,7 +7,7 @@
 # special case begin
 # The bootstrap library has a few manual tweaks compared to other
 # libraries.
-add_library(Bootstrap STATIC)
+qt_add_library(Bootstrap STATIC)
 # special case end
 qt_internal_extend_target(Bootstrap
     SOURCES