Skip to content

Instantly share code, notes, and snippets.

View torarnv's full-sized avatar

Tor Arne Vestbø torarnv

  • The Qt Company
  • Oslo, Norway
View GitHub Profile
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
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);
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}}"
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
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)
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".
diff --git src/quick/items/qquickwindowcontainer_p.h src/quick/items/qquickwindowcontainer_p.h
index d229009355a..64e4cf697eb 100644
--- src/quick/items/qquickwindowcontainer_p.h
+++ src/quick/items/qquickwindowcontainer_p.h
@@ -20,12 +20,14 @@
#include <QtCore/private/qobject_p.h>
#include <QtQuick/private/qquickimplicitsizeitem_p.h>
+#include <QtQuick/private/qquickitemchangelistener_p.h>
#include <QtQuick/qquickwindow.h>
diff --git c/src/quick/items/qquickwindowcontainer.cpp i/src/quick/items/qquickwindowcontainer.cpp
index 0c3a6cf8258..245145f2b30 100644
--- c/src/quick/items/qquickwindowcontainer.cpp
+++ i/src/quick/items/qquickwindowcontainer.cpp
@@ -443,6 +443,28 @@ void QQuickWindowContainer::updatePolish()
}
}
+QRectF QQuickWindowContainer::clipRect() const
+{
diff --git c/src/quick/items/qquickwindowcontainer.cpp i/src/quick/items/qquickwindowcontainer.cpp
index 0c3a6cf8258..245145f2b30 100644
--- c/src/quick/items/qquickwindowcontainer.cpp
+++ i/src/quick/items/qquickwindowcontainer.cpp
@@ -443,6 +443,28 @@ void QQuickWindowContainer::updatePolish()
}
}
+QRectF QQuickWindowContainer::clipRect() const
+{
diff --git i/examples/quick/quick.pro w/examples/quick/quick.pro
index b20d92ddb41..03046f135c0 100644
--- i/examples/quick/quick.pro
+++ w/examples/quick/quick.pro
@@ -26,7 +26,8 @@ SUBDIRS = quick-accessibility \
delegatechooser \
shapes \
itemvariablerefreshrate \
- multieffect
+ multieffect \