8 files changed, 13 insertions, 18 deletions
diff --git a/cmake/QtPublicAppleHelpers.cmake b/cmake/QtPublicAppleHelpers.cmake
index 3ffe53c6f34..b8f3fb4818e 100644
--- a/cmake/QtPublicAppleHelpers.cmake
+++ b/cmake/QtPublicAppleHelpers.cmake
@@ -1028,7 +1028,6 @@ function(_qt_internal_check_apple_sdk_and_xcode_versions)
     endif()
 
     _qt_internal_get_cached_apple_sdk_version(sdk_version)
-    _qt_internal_get_cached_xcode_version(xcode_version)
 
     if(NOT max_sdk_version MATCHES "^[0-9]+$")
         message(FATAL_ERROR
@@ -1075,12 +1074,15 @@ function(_qt_internal_check_apple_sdk_and_xcode_versions)
         )
     endif()
 
-    if(xcode_version VERSION_LESS min_xcode_version AND NOT QT_NO_XCODE_MIN_VERSION_CHECK)
-        message(${message_type}
-            "Qt requires at least version ${min_xcode_version} of Xcode, "
-            "you're building against version ${xcode_version}. Please upgrade."
-            ${extra_message}
-        )
+    if(NOT QT_NO_XCODE_MIN_VERSION_CHECK)
+        _qt_internal_get_cached_xcode_version(xcode_version)
+        if(xcode_version VERSION_LESS min_xcode_version)
+            message(${message_type}
+                "Qt requires at least version ${min_xcode_version} of Xcode, "
+                "you're building against version ${xcode_version}. Please upgrade."
+                ${extra_message}
+            )
+        endif()
     endif()
 
     if(QT_NO_APPLE_SDK_MAX_VERSION_CHECK)
diff --git a/configure.cmake b/configure.cmake
index e89922f76f8..0d4e5b04688 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -621,7 +621,7 @@ qt_feature("private_tests" PRIVATE
 )
 qt_feature("doc_snippets" PRIVATE
     LABEL "Developer build: doc_snippets"
-    AUTODETECT QT_FEATURE_developer_build
+    AUTODETECT QT_BUILD_DOC_SNIPPETS
     CONDITION QT_FEATURE_shared
 )
 qt_feature_definition("developer-build" "QT_BUILD_INTERNAL")
diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
index b8e5e038a33..7cd3f91b901 100644
--- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
@@ -525,7 +525,6 @@ To prevent this, set \c QT_NO_SET_XCODE_BUNDLE_IDENTIFIER to \c TRUE.
 \summary {Enables verbose mode of deployment tools.}
 
 \cmakevariablesince 6.3
-\preliminarycmakevariable
 
 Enables verbose mode of the \l androiddeployqt deployment tool when it is called
 internally at build time, usually during target finalization.
@@ -545,7 +544,6 @@ must be set before the first \c{find_package(Qt6)} call to have that effect.
 \summary {Name of the file to include for setting up deployment support.}
 
 \cmakevariablesince 6.3
-\preliminarycmakevariable
 \note The value of this variable should never be modified by project code.
 
 This configure-phase variable is set by the Core package. It is intended to be
diff --git a/src/corelib/doc/src/cmake/cmake-properties.qdoc b/src/corelib/doc/src/cmake/cmake-properties.qdoc
index 821862494a2..c7b1a27a4b4 100644
--- a/src/corelib/doc/src/cmake/cmake-properties.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-properties.qdoc
@@ -665,7 +665,6 @@ UTF-8 input). Use the \l QT_NO_CAST_FROM_ASCII and
 \summary {Specifies the default Qt resource prefix.}
 
 \cmakepropertysince 6.0
-\preliminarycmakeproperty
 
 When using \l{qt6_add_resources}{qt_add_resources} without a \c PREFIX
 argument, then the value of this target property will be used as
@@ -773,7 +772,6 @@ CMake properties:
 \brief Sets the FOLDER property for Qt-internal targets.
 
 \cmakepropertysince 6.5
-\preliminarycmakeproperty
 
 Name of the \l FOLDER for internal targets that are added by Qt's CMake
 commands.
diff --git a/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc b/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc
index 43ff23a35a1..e6d3edbbdc4 100644
--- a/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc
+++ b/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc
@@ -17,7 +17,6 @@ can only be called from a deployment script. It cannot be called directly by the
 project during the configure stage.
 
 \cmakecommandsince 6.5
-\preliminarycmakecommand
 \note This command does not usually need to be called directly. It is used
       internally by other higher level commands, but projects wishing to
       implement more customized deployment logic may find it useful.
diff --git a/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc b/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc
index 7ec8d90f9b1..24112b1cf87 100644
--- a/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc
+++ b/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc
@@ -11,7 +11,6 @@
 \summary {Extracts metatypes from a Qt target and generates an associated metatypes.json file.}
 
 \cmakecommandsince 6.0
-\preliminarycmakecommand
 
 \section1 Synopsis
 
diff --git a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc
index 5506712691e..f60b850fcdb 100644
--- a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc
+++ b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc
@@ -9,7 +9,6 @@
 \keyword qt6_finalize_project
 
 \summary {Handles various common platform-specific tasks associated with a Qt project.}
-\preliminarycmakecommand
 
 \include cmake-find-package-core.qdocinc
 
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 29cafe9aea4..f3db4ece49e 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -305,9 +305,7 @@ namespace QTest {
     {
         static QBasicAtomicInt counter = Q_BASIC_ATOMIC_INITIALIZER(QTest::maxWarnings);
 
-        auto loggerCapture = loggers->allLoggers();
-
-        if (loggerCapture.isEmpty()) {
+        if (loggers.isDestroyed() || loggers->allLoggers().isEmpty()) {
             // the message handler may be called from a worker thread, after the main thread stopped
             // logging. Forwarding to original message handler to avoid swallowing the message
             Q_ASSERT(oldMessageHandler);
@@ -326,6 +324,8 @@ namespace QTest {
             return;
         }
 
+        auto loggerCapture = loggers->allLoggers();
+
         if (type != QtFatalMsg) {
             if (counter.loadRelaxed() <= 0)
                 return;