Merge "Fix installation of Find*.cmake files in shadow per-repo builds"

cmake/QtBuildInternals/QtBuildInternalsConfig.cmake

@@ -369,7 +369,7 @@ macro(qt_build_repo_end)
         qt_path_join(__qt_repo_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE})
 
         if(NOT PROJECT_NAME STREQUAL "QtBase")
-            if (EXISTS cmake)
+            if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
                 qt_copy_or_install(DIRECTORY cmake/
                     DESTINATION "${__qt_repo_install_dir}"
                     FILES_MATCHING PATTERN "Find*.cmake"

configure.cmake

@@ -1,5 +1,3 @@
-
-
 #### Inputs
 
 
@@ -1090,6 +1088,13 @@ qt_configure_add_report_entry(
     MESSAGE "Command line option -sanitize fuzzer-no-link is only supported with clang compilers."
     CONDITION QT_FEATURE_sanitize_fuzzer_no_link AND NOT CLANG
 )
+# special case begin
+qt_configure_add_report_entry(
+    TYPE ERROR
+    MESSAGE "Setting a library infix is not supported for framework builds."
+    CONDITION QT_FEATURE_framework AND DEFINED QT_LIBINFIX
+)
+# special case end
 
 qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
 qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)

src/entrypoint/CMakeLists.txt

@@ -94,7 +94,7 @@ if(using_entrypoint_library)
     set_target_properties(EntryPoint PROPERTIES
         INTERFACE_QT_MODULE_PRI_EXTRA_CONTENT "
 QT.entrypoint_implementation.name = QtEntryPointImplementation
-QT.entrypoint_implementation.module = Qt6EntryPoint
+QT.entrypoint_implementation.module = Qt6EntryPoint${QT_LIBINFIX}
 QT.entrypoint_implementation.ldflags = ${entrypoint_implementation_ldflags}
 QT.entrypoint_implementation.libs = $$QT_MODULE_LIB_BASE
 QT.entrypoint_implementation.module_config = staticlib v2 internal_module