diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index a7315550e2a..196c6a316f1 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -669,6 +669,11 @@ set(QT_VISIBILITY_AVAILABLE TRUE)")
 set(QT_LIBINFIX \"${QT_LIBINFIX}\")")
             endif()
 
+            # Store whether find_package(Qt6Foo) should succeed if Qt6FooTools is missing.
+            if(QT_ALLOW_MISSING_TOOLS_PACKAGES)
+                string(APPEND qtcore_extra_cmake_code "
+set(QT_ALLOW_MISSING_TOOLS_PACKAGES TRUE)")
+            endif()
         endif()
 
         configure_file("${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in"
diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake
index 803cb73e637..7fca0fa66dc 100644
--- a/cmake/QtPublicDependencyHelpers.cmake
+++ b/cmake/QtPublicDependencyHelpers.cmake
@@ -67,7 +67,7 @@ macro(_qt_internal_find_tool_dependencies target target_dep_list)
                 "${_qt_cmake_dir}"
                 ${_qt_additional_packages_prefix_paths}
         )
-        if (NOT ${__qt_${target}_pkg}_FOUND)
+        if (NOT ${__qt_${target}_pkg}_FOUND AND NOT QT_ALLOW_MISSING_TOOLS_PACKAGES)
             set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
             set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
 "${CMAKE_FIND_PACKAGE_NAME} could not be found because dependency \