This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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". |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | |
+{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | |
+{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 7f7e13844221b850780086cf916796123d8f196e | |
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io> | |
Date: Sat Nov 4 14:11:12 2023 +0100 | |
gpush: Don't use exsha1 as a SCALAR ref when checking duplicate change IDs | |
Change-Id: I3f7b2964316393b70a70e5b2dfe4b0f2261ec012 | |
diff --git a/bin/git_gpush.pm b/bin/git_gpush.pm | |
index 36e9891..684e7c2 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/src/gui/CMakeLists.txt w/src/gui/CMakeLists.txt | |
index e848ac23c32..989e94c2263 100644 | |
--- i/src/gui/CMakeLists.txt | |
+++ w/src/gui/CMakeLists.txt | |
@@ -1000,6 +1000,7 @@ qt_internal_extend_target(Gui CONDITION IOS OR MACOS | |
rhi/qrhimetal.mm rhi/qrhimetal_p.h | |
PUBLIC_LIBRARIES | |
${FWMetal} | |
+ ${FWQuartzCore} | |
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 27c2403b8d4cc507151875a2bfea0e9e08ccf919 | |
Author: Tor Arne Vestbø <tor.arne.vestbo@qt.io> | |
Date: Wed Oct 11 16:05:56 2023 +0200 | |
WIP on reversting object creation | |
Change-Id: I14bcd7efd5e4a9839ee343f99ef2964d4165785f | |
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp | |
index dc4f25c22d5..a018ba38fde 100644 |
NewerOlder