torarnv

diff --git i/cmake/QtPublicAppleHelpers.cmake w/cmake/QtPublicAppleHelpers.cmake
index d6a5c7856c4..1f2e92cca4b 100644
--- i/cmake/QtPublicAppleHelpers.cmake
+++ w/cmake/QtPublicAppleHelpers.cmake
@@ -732,29 +732,25 @@ endfunction()
 
 # Export Apple platform sdk and xcode version requirements to Qt6ConfigExtras.cmake.
 function(_qt_internal_export_apple_sdk_and_xcode_version_requirements out_var)
-    if(NOT APPLE)
-        return()

torarnv

commit 384146e1c4db9808f6ce79b6af3857399a45fe4f
Merge: 8f79864cf62 d3cc207ff45
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Date:   Thu Oct 17 11:29:15 2024 +0200

    WIP on dev: 8f79864cf62 macOS: Release main thread transaction block as soon as we're done with it

diff --cc examples/widgets/widgets/lineedits/window.cpp
index c8a47a15942,c8a47a15942..fb351a3fcb0
--- a/examples/widgets/widgets/lineedits/window.cpp

torarnv

diff --git c/cmake/QtTargetHelpers.cmake w/cmake/QtTargetHelpers.cmake
index b90b95870d9..2619399d667 100644
--- c/cmake/QtTargetHelpers.cmake
+++ w/cmake/QtTargetHelpers.cmake
@@ -505,7 +505,15 @@ function(qt_internal_setup_cmake_config_postfix)
             set(default_cmake_debug_postfix "d")
         endif()
     elseif(APPLE)
-        set(default_cmake_debug_postfix "_debug")
+        # Avoid setting a suffix for framework builds, as the

torarnv

diff --git i/cmake/QtTargetHelpers.cmake w/cmake/QtTargetHelpers.cmake
index 784630b45b1..2619399d667 100644
--- i/cmake/QtTargetHelpers.cmake
+++ w/cmake/QtTargetHelpers.cmake
@@ -508,8 +508,11 @@ function(qt_internal_setup_cmake_config_postfix)
         # Avoid setting a suffix for framework builds, as the
         # libraries inside the framework are always unsuffixed,
         # and we want to match that for plugins/static libs.
-        if(NOT QT_FEATURE_framework)
+        if(NOT QT_FEATURE_framework AND NOT FEATURE_framework)

torarnv

diff --git i/src/3rdparty/assimp/src w/src/3rdparty/assimp/src
index 5967dee48..e21b73ab4 160000
--- i/src/3rdparty/assimp/src
+++ w/src/3rdparty/assimp/src
@@ -1 +1 @@
-Subproject commit 5967dee48b0b8ed32a41579559570e380462a1dd
+Subproject commit e21b73ab492fefb0cab229da75e385ba0befbffc
diff --git i/src/xr/quick3dxr/visionos/qquick3dxrmanager_visionos.mm w/src/xr/quick3dxr/visionos/qquick3dxrmanager_visionos.mm
index a02e35b11..fd75e8ce6 100644
--- i/src/xr/quick3dxr/visionos/qquick3dxrmanager_visionos.mm

torarnv

diff --git i/src/plugins/platforms/ios/qiosintegration.mm w/src/plugins/platforms/ios/qiosintegration.mm
index 76173ce830a..5490f48eb99 100644
--- i/src/plugins/platforms/ios/qiosintegration.mm
+++ w/src/plugins/platforms/ios/qiosintegration.mm
@@ -309,6 +309,8 @@ void QIOSIntegration::openImmersiveSpace()
 void QIOSIntegration::dismissImmersiveSpace()
 {
     [ImmersiveSpaceManager dismissImmersiveSpace];
+    if (m_immersiveSpaceCompositorLayer)
+        m_immersiveSpaceCompositorLayer->render(nullptr);

torarnv

diff --git i/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml w/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
index a7039b5015e..6543c6bbfd6 100644
--- i/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
+++ w/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
@@ -104,14 +104,35 @@ instructions:
           property: features
           contains_value: TestOnly
 
-  - type: ExecuteCommand
-    command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"

torarnv

diff --git 1/qtci-macos-13-x86_64/01-sha1sum-compatibility.sh 2/qtci-macos-14-x86_64/01-sha1sum-compatibility.sh
index 583195c7..e31fe48b 100755
--- 1/qtci-macos-13-x86_64/01-sha1sum-compatibility.sh
+++ 2/qtci-macos-14-x86_64/01-sha1sum-compatibility.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 

torarnv

diff --git i/src/qml/Qt6QmlMacros.cmake w/src/qml/Qt6QmlMacros.cmake
index 10320a87f08..e8c9bd1b0d3 100644
--- i/src/qml/Qt6QmlMacros.cmake
+++ w/src/qml/Qt6QmlMacros.cmake
@@ -2924,7 +2924,11 @@ function(_qt_internal_qml_type_registration target)
     set(type_registration_cpp_file "${target_binary_dir}/${type_registration_cpp_file_name}")
 
     # Enable evaluation of metatypes.json source interfaces
-    set_target_properties(${target} PROPERTIES QT_CONSUMES_METATYPES TRUE)
+    if(NOT TARGET qt_metatypes)

torarnv

commit 8a808da0623287a9ba41519b3dd6403538f33c28
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Date:   Wed Jan 3 19:08:02 2024 +0100

    macOS: Reset save dialog extension when resetting file name filter
    
    We map QFileDialog name filters to NSSavePanel.allowedFileTypes, for
    example turning "Text Files (*.txt)" into allowedFileTypes = @[@"txt"].
    In this case, the NSSavePanel will automatically add the extension to
    the user's file name, if they just type "foo".