Friday, February 06, 2026

UPDATE: x11/qt6

Here is diff to update Qt6 to the latest stable version 6.10.2. I'm
still playing with it and plan to commit it after c2k26.

Feedback and tests welcome.

Rafael

Index: Makefile.version
===================================================================
RCS file: /cvs/ports/x11/qt6/Makefile.version,v
diff -u -p -r1.19 Makefile.version
--- Makefile.version 9 Dec 2025 10:37:31 -0000 1.19
+++ Makefile.version 6 Feb 2026 15:29:24 -0000
@@ -1,6 +1,6 @@
# Common source for Qt6 version
-QT6_VERSION = 6.10.1
-PYSIDE_VERSION = 6.10.1
+QT6_VERSION = 6.10.2
+PYSIDE_VERSION = 6.10.2

# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
Index: pyside6/pyside/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/pyside6/pyside/distinfo,v
diff -u -p -r1.5 distinfo
--- pyside6/pyside/distinfo 9 Dec 2025 10:37:31 -0000 1.5
+++ pyside6/pyside/distinfo 6 Feb 2026 15:29:24 -0000
@@ -1,6 +1,6 @@
SHA256 (qt/0001-Fix-installation.patch) = gmn3JCSQunjBRo2GTQZ/9OKlzkItkeDJpgx3+MNrs9w=
SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8=
-SHA256 (qt/pyside-setup-everywhere-src-6.10.1.tar.xz) = /VT0CFPWHf2EXbtA1PifvWPfXtNBs9mix3u1yUegqDg=
+SHA256 (qt/pyside-setup-everywhere-src-6.10.2.tar.xz) = Be7Di7cb//+IYHhuPAdmzEuGr/xyQ5vSRsVIib3LdAA=
SIZE (qt/0001-Fix-installation.patch) = 2347
SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793
-SIZE (qt/pyside-setup-everywhere-src-6.10.1.tar.xz) = 17746968
+SIZE (qt/pyside-setup-everywhere-src-6.10.2.tar.xz) = 17877708
Index: pyside6/shiboken/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/pyside6/shiboken/Makefile,v
diff -u -p -r1.12 Makefile
--- pyside6/shiboken/Makefile 14 Dec 2025 11:18:41 -0000 1.12
+++ pyside6/shiboken/Makefile 6 Feb 2026 15:29:24 -0000
@@ -1,6 +1,5 @@
COMMENT = Python binding generator for C++ libraries
PKGNAME = shiboken6-${VERSION}
-REVISION = 0

SHARED_LIBS += shiboken6.abi3 2.0 # 0.0

Index: pyside6/shiboken/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/pyside6/shiboken/distinfo,v
diff -u -p -r1.5 distinfo
--- pyside6/shiboken/distinfo 9 Dec 2025 10:37:31 -0000 1.5
+++ pyside6/shiboken/distinfo 6 Feb 2026 15:29:24 -0000
@@ -1,6 +1,6 @@
SHA256 (qt/0001-Fix-installation.patch) = gmn3JCSQunjBRo2GTQZ/9OKlzkItkeDJpgx3+MNrs9w=
SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8=
-SHA256 (qt/pyside-setup-everywhere-src-6.10.1.tar.xz) = /VT0CFPWHf2EXbtA1PifvWPfXtNBs9mix3u1yUegqDg=
+SHA256 (qt/pyside-setup-everywhere-src-6.10.2.tar.xz) = Be7Di7cb//+IYHhuPAdmzEuGr/xyQ5vSRsVIib3LdAA=
SIZE (qt/0001-Fix-installation.patch) = 2347
SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793
-SIZE (qt/pyside-setup-everywhere-src-6.10.1.tar.xz) = 17746968
+SIZE (qt/pyside-setup-everywhere-src-6.10.2.tar.xz) = 17877708
Index: pyside6/tools/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/pyside6/tools/distinfo,v
diff -u -p -r1.5 distinfo
--- pyside6/tools/distinfo 9 Dec 2025 10:37:31 -0000 1.5
+++ pyside6/tools/distinfo 6 Feb 2026 15:29:24 -0000
@@ -1,6 +1,6 @@
SHA256 (qt/0001-Fix-installation.patch) = gmn3JCSQunjBRo2GTQZ/9OKlzkItkeDJpgx3+MNrs9w=
SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8=
-SHA256 (qt/pyside-setup-everywhere-src-6.10.1.tar.xz) = /VT0CFPWHf2EXbtA1PifvWPfXtNBs9mix3u1yUegqDg=
+SHA256 (qt/pyside-setup-everywhere-src-6.10.2.tar.xz) = Be7Di7cb//+IYHhuPAdmzEuGr/xyQ5vSRsVIib3LdAA=
SIZE (qt/0001-Fix-installation.patch) = 2347
SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793
-SIZE (qt/pyside-setup-everywhere-src-6.10.1.tar.xz) = 17746968
+SIZE (qt/pyside-setup-everywhere-src-6.10.2.tar.xz) = 17877708
Index: qt3d/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/Makefile,v
diff -u -p -r1.14 Makefile
--- qt3d/Makefile 19 Jan 2026 09:48:59 -0000 1.14
+++ qt3d/Makefile 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,6 @@
QT6NAME = Qt3D
COMMENT = Qt6 components for 3D graphics
PKGSPEC = qt6-qt3d-${QT6_PKGSPEC}
-REVISION = 0

SHARED_LIBS += Qt63DAnimation 1.0 # 6.6
SHARED_LIBS += Qt63DCore 1.2 # 6.6
Index: qt3d/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/distinfo,v
diff -u -p -r1.13 distinfo
--- qt3d/distinfo 9 Dec 2025 10:37:31 -0000 1.13
+++ qt3d/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-src-6.10.1.tar.xz) = YFk/1U97HkjcZ93ODxET5Fk4eIclOWdxBMkpJu8DnJo=
-SIZE (qt/qt3d-everywhere-src-6.10.1.tar.xz) = 141828584
+SHA256 (qt/qt3d-everywhere-src-6.10.2.tar.xz) = /rvKnUkf7KD6LXcOkSWQtO8Y5GH3OcpuhV6mKkiLu20=
+SIZE (qt/qt3d-everywhere-src-6.10.2.tar.xz) = 141816364
Index: qt5compat/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/Makefile,v
diff -u -p -r1.9 Makefile
--- qt5compat/Makefile 19 Jan 2026 09:48:59 -0000 1.9
+++ qt5compat/Makefile 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,6 @@
QT6NAME = Qt5Compat
COMMENT = Qt6 module contains unsupported Qt 5 APIs
PKGSPEC = qt6-qt5compat-${QT6_PKGSPEC}
-REVISION = 0

SHARED_LIBS += Qt6Core5Compat 1.0 # 6.5

Index: qt5compat/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/distinfo,v
diff -u -p -r1.16 distinfo
--- qt5compat/distinfo 9 Dec 2025 10:37:31 -0000 1.16
+++ qt5compat/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt5compat-everywhere-src-6.10.1.tar.xz) = cjltFgoVPe4BtBzwyumtRiBM9hOtt5Gz7oWn7+rf/iQ=
-SIZE (qt/qt5compat-everywhere-src-6.10.1.tar.xz) = 14615528
+SHA256 (qt/qt5compat-everywhere-src-6.10.2.tar.xz) = P6QY8PrALrnvxfdi++JfIGR7Drt/qS+vB+behQRBYcI=
+SIZE (qt/qt5compat-everywhere-src-6.10.2.tar.xz) = 14619684
Index: qtbase/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
diff -u -p -r1.52 Makefile
--- qtbase/Makefile 22 Dec 2025 05:32:22 -0000 1.52
+++ qtbase/Makefile 6 Feb 2026 15:29:25 -0000
@@ -4,7 +4,6 @@ COMMENT-main = C++ general-purpose tool
COMMENT-global = global Qt6 documentation internals
COMMENT-mysql = MySQL plugin for Qt6
COMMENT-psql = PostgresSQL plugin for Qt6
-REVISION-main = 1

PKGSPEC-main = qt6-qtbase-${QT6_PKGSPEC}

@@ -17,23 +16,22 @@ PKG_ARCH-global = *
DPB_PROPERTIES = parallel

SHARED_LIBS += Qt6Concurrent 0.1 # 6.7
-SHARED_LIBS += Qt6Core 6.0 # 6.7
+SHARED_LIBS += Qt6Core 7.0 # 6.7
SHARED_LIBS += Qt6DBus 3.1 # 6.7
-SHARED_LIBS += Qt6Gui 8.0 # 6.7
-SHARED_LIBS += Qt6Network 4.0 # 6.7
+SHARED_LIBS += Qt6Gui 9.0 # 6.7
+SHARED_LIBS += Qt6Network 5.0 # 6.7
SHARED_LIBS += Qt6OpenGL 3.0 # 6.7
SHARED_LIBS += Qt6PrintSupport 1.1 # 6.7
SHARED_LIBS += Qt6Sql 3.1 # 6.7
SHARED_LIBS += Qt6Test 5.0 # 6.7
-SHARED_LIBS += Qt6Widgets 4.0 # 6.7
+SHARED_LIBS += Qt6Widgets 5.0 # 6.7
SHARED_LIBS += Qt6Xml 1.0 # 6.7
SHARED_LIBS += Qt6EglFSDeviceIntegration 2.0 # 6.7
SHARED_LIBS += Qt6EglFsKmsSupport 1.0 # 6.7
-SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.7
SHARED_LIBS += Qt6XcbQpa 4.1 # 6.7
SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.7
SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.7
-SHARED_LIBS += Qt6WaylandClient 8.0 # 6.7
+SHARED_LIBS += Qt6WaylandClient 9.0 # 6.7
SHARED_LIBS += Qt6WlShellIntegration 4.0 # 6.7

WANTLIB-main += ${COMPILER_LIBCXX} EGL GL ICE SM X11 X11-xcb atk-1.0
Index: qtbase/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/distinfo,v
diff -u -p -r1.16 distinfo
--- qtbase/distinfo 9 Dec 2025 10:37:31 -0000 1.16
+++ qtbase/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-src-6.10.1.tar.xz) = WmIm9+I9tR/cMiMSHrpT8/VEfPDMTWy4Kjot96ZdJl0=
-SIZE (qt/qtbase-everywhere-src-6.10.1.tar.xz) = 50234516
+SHA256 (qt/qtbase-everywhere-src-6.10.2.tar.xz) = rreNKSkaK1/VPLVZUPj1BltJeMJfsdd/Yn1pWrmt8h4=
+SIZE (qt/qtbase-everywhere-src-6.10.2.tar.xz) = 50374380
Index: qtbase/patches/patch-cmake_QtFeature_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake,v
diff -u -p -r1.12 patch-cmake_QtFeature_cmake
--- qtbase/patches/patch-cmake_QtFeature_cmake 9 Dec 2025 10:37:32 -0000 1.12
+++ qtbase/patches/patch-cmake_QtFeature_cmake 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtFeature.cmake
--- cmake/QtFeature.cmake.orig
+++ cmake/QtFeature.cmake
-@@ -1748,7 +1748,23 @@ function(qt_get_platform_try_compile_vars out_var)
+@@ -1790,7 +1790,23 @@ function(qt_get_platform_try_compile_vars out_var)
set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE)
endfunction()

Index: qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
===================================================================
RCS file: qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
diff -N qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
--- qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake 9 Dec 2025 10:37:32 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: cmake/QtProcessConfigureArgs.cmake
---- cmake/QtProcessConfigureArgs.cmake.orig
-+++ cmake/QtProcessConfigureArgs.cmake
-@@ -290,6 +290,7 @@ defstub(qt_feature_definition)
- defstub(qt_find_package)
- defstub(set_package_properties)
- defstub(qt_qml_find_python)
-+defstub(qt_test_lib_target)
- defstub(qt_set01)
- defstub(qt_internal_check_if_linker_is_available)
- defstub(qt_internal_add_sbom)
Index: qtbase/patches/patch-src_gui_configure_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-src_gui_configure_cmake,v
diff -u -p -r1.3 patch-src_gui_configure_cmake
--- qtbase/patches/patch-src_gui_configure_cmake 9 Dec 2025 10:37:32 -0000 1.3
+++ qtbase/patches/patch-src_gui_configure_cmake 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,7 @@
Index: src/gui/configure.cmake
--- src/gui/configure.cmake.orig
+++ src/gui/configure.cmake
-@@ -76,7 +76,7 @@ qt_find_package(GLESv2 MODULE
+@@ -79,7 +79,7 @@ qt_find_package(GLESv2 MODULE
qt_find_package(Tslib MODULE PROVIDED_TARGETS PkgConfig::Tslib MODULE_NAME gui QMAKE_LIB tslib)
qt_find_package(WrapVulkanHeaders MODULE PROVIDED_TARGETS WrapVulkanHeaders::WrapVulkanHeaders
MODULE_NAME gui QMAKE_LIB vulkan MARK_OPTIONAL)
@@ -10,7 +10,7 @@ Index: src/gui/configure.cmake
qt_find_package(Wayland MODULE PROVIDED_TARGETS Wayland::Server
MODULE_NAME gui QMAKE_LIB wayland_server)
qt_find_package(Wayland MODULE PROVIDED_TARGETS Wayland::Client
-@@ -192,7 +192,7 @@ endif()
+@@ -195,7 +195,7 @@ endif()
qt_add_qmake_lib_dependency(xrender xlib)

# qt wayland client
@@ -19,7 +19,7 @@ Index: src/gui/configure.cmake
# EGL
if(NOT TARGET EGL::EGL)
qt_find_package(EGL MODULE
-@@ -429,7 +429,7 @@ PVRGrfxServerInit();
+@@ -432,7 +432,7 @@ PVRGrfxServerInit();
qt_config_compile_test(evdev
LABEL "evdev"
CODE
Index: qtbase/patches/patch-src_network_socket_qnativesocketengine_unix_cpp
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-src_network_socket_qnativesocketengine_unix_cpp,v
diff -u -p -r1.2 patch-src_network_socket_qnativesocketengine_unix_cpp
--- qtbase/patches/patch-src_network_socket_qnativesocketengine_unix_cpp 9 Dec 2025 10:37:32 -0000 1.2
+++ qtbase/patches/patch-src_network_socket_qnativesocketengine_unix_cpp 6 Feb 2026 15:29:25 -0000
@@ -3,7 +3,7 @@ https://codereview.qt-project.org/c/qt/q
Index: src/network/socket/qnativesocketengine_unix.cpp
--- src/network/socket/qnativesocketengine_unix.cpp.orig
+++ src/network/socket/qnativesocketengine_unix.cpp
-@@ -1429,7 +1429,7 @@ int QNativeSocketEnginePrivate::nativeSelect(QDeadline
+@@ -1431,7 +1431,7 @@ int QNativeSocketEnginePrivate::nativeSelect(QDeadline
}

static const short read_flags = POLLIN | POLLHUP | POLLERR;
Index: qtbase/pkg/PLIST-global
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/pkg/PLIST-global,v
diff -u -p -r1.12 PLIST-global
--- qtbase/pkg/PLIST-global 9 Dec 2025 10:37:32 -0000 1.12
+++ qtbase/pkg/PLIST-global 6 Feb 2026 15:29:25 -0000
@@ -187,8 +187,8 @@ share/qt6/wayland/protocols/appmenu/appm
share/qt6/wayland/protocols/appmenu/qt_attribution.json
share/qt6/wayland/protocols/color-management/
share/qt6/wayland/protocols/color-management/REUSE.toml
+share/qt6/wayland/protocols/color-management/color-management-v1.xml
share/qt6/wayland/protocols/color-management/qt_attribution.json
-share/qt6/wayland/protocols/color-management/xx-color-management-v4.xml
share/qt6/wayland/protocols/cursor-shape/
share/qt6/wayland/protocols/cursor-shape/REUSE.toml
share/qt6/wayland/protocols/cursor-shape/cursor-shape-v1.xml
Index: qtbase/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/pkg/PLIST-main,v
diff -u -p -r1.18 PLIST-main
--- qtbase/pkg/PLIST-main 9 Dec 2025 10:37:32 -0000 1.18
+++ qtbase/pkg/PLIST-main 6 Feb 2026 15:29:25 -0000
@@ -2171,6 +2171,7 @@ include/X11/qt6/QtWaylandClient/${VERSIO
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qtwaylandclient-config_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qtwaylandclientglobal_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-appmenu.h
+include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-color-management-v1.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-cursor-shape-v1.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-fractional-scale-v1.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-hardware-integration.h
@@ -2191,7 +2192,6 @@ include/X11/qt6/QtWaylandClient/${VERSIO
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-xdg-shell.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-xdg-system-bell-v1.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-xdg-toplevel-drag-v1.h
-include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwayland-xx-color-management-v4.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandabstractdecoration_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandappmenu_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandbuffer_p.h
@@ -2212,7 +2212,6 @@ include/X11/qt6/QtWaylandClient/${VERSIO
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylanddecorationplugin_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylanddisplay_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylanddnd_p.h
-include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandeventdispatcher_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandfractionalscale_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandhardwareintegration_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandinputcontext_p.h
@@ -2253,6 +2252,7 @@ include/X11/qt6/QtWaylandClient/${VERSIO
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandwindow_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-appmenu-client-protocol.h
+include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-color-management-v1-client-protocol.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-cursor-shape-v1-client-protocol.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-fractional-scale-v1-client-protocol.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
@@ -2273,7 +2273,6 @@ include/X11/qt6/QtWaylandClient/${VERSIO
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-xdg-shell-client-protocol.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-xdg-system-bell-v1-client-protocol.h
include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-xdg-toplevel-drag-v1-client-protocol.h
-include/X11/qt6/QtWaylandClient/${VERSION}/QtWaylandClient/private/wayland-xx-color-management-v4-client-protocol.h
include/X11/qt6/QtWaylandClient/QWaylandClientExtension
include/X11/qt6/QtWaylandClient/QWaylandClientExtensionTemplate
include/X11/qt6/QtWaylandClient/QtWaylandClient
@@ -2395,6 +2394,7 @@ include/X11/qt6/QtWidgets/${VERSION}/QtW
include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtoolbarextension_p.h
include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtoolbarlayout_p.h
include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtoolbarseparator_p.h
+include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtooltip_p.h
include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtreeview_p.h
include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtreewidget_p.h
include/X11/qt6/QtWidgets/${VERSION}/QtWidgets/private/qtreewidgetitemiterator_p.h
@@ -2963,9 +2963,13 @@ lib/cmake/Qt6/QtPublicGitHelpers.cmake
lib/cmake/Qt6/QtPublicPluginHelpers.cmake
lib/cmake/Qt6/QtPublicPluginHelpers_v2.cmake
lib/cmake/Qt6/QtPublicSbomAttributionHelpers.cmake
+lib/cmake/Qt6/QtPublicSbomCommonGenerationHelpers.cmake
lib/cmake/Qt6/QtPublicSbomCpeHelpers.cmake
+lib/cmake/Qt6/QtPublicSbomCycloneDXHelpers.cmake
lib/cmake/Qt6/QtPublicSbomDepHelpers.cmake
+lib/cmake/Qt6/QtPublicSbomDocumentNamespaceHelpers.cmake
lib/cmake/Qt6/QtPublicSbomFileHelpers.cmake
+lib/cmake/Qt6/QtPublicSbomGenerationCycloneDXHelpers.cmake
lib/cmake/Qt6/QtPublicSbomGenerationHelpers.cmake
lib/cmake/Qt6/QtPublicSbomHelpers.cmake
lib/cmake/Qt6/QtPublicSbomLicenseHelpers.cmake
@@ -3767,6 +3771,8 @@ lib/qt6/libexec/${MODPY_PYCACHE}qt-andro
lib/qt6/libexec/${MODPY_PYCACHE}qt-android-runner.${MODPY_PYC_MAGIC_TAG}pyc
lib/qt6/libexec/${MODPY_PYCACHE}qt-testrunner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/qt6/libexec/${MODPY_PYCACHE}qt-testrunner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/qt6/libexec/${MODPY_PYCACHE}qt_cyclonedx_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/qt6/libexec/${MODPY_PYCACHE}qt_cyclonedx_generator.${MODPY_PYC_MAGIC_TAG}pyc
lib/qt6/libexec/${MODPY_PYCACHE}sanitizer-testrunner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/qt6/libexec/${MODPY_PYCACHE}sanitizer-testrunner.${MODPY_PYC_MAGIC_TAG}pyc
@bin lib/qt6/libexec/cmake_automoc_parser
@@ -3780,6 +3786,7 @@ lib/qt6/libexec/qt-cmake-standalone-test
lib/qt6/libexec/qt-internal-configure-examples
lib/qt6/libexec/qt-internal-configure-tests
lib/qt6/libexec/qt-testrunner.py
+lib/qt6/libexec/qt_cyclonedx_generator.py
@bin lib/qt6/libexec/qtwaylandscanner
@bin lib/qt6/libexec/qvkgen
@bin lib/qt6/libexec/rcc
Index: qtcharts/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtcharts/Makefile,v
diff -u -p -r1.9 Makefile
--- qtcharts/Makefile 19 Jan 2026 09:48:59 -0000 1.9
+++ qtcharts/Makefile 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,6 @@
QT6NAME = QtCharts
COMMENT = Qt6 components for drawing 2D charts
PKGSPEC = qt6-qtcharts-${QT6_PKGSPEC}
-REVISION = 0

SHARED_LIBS += Qt6Charts 3.0 # 6.7
SHARED_LIBS += Qt6ChartsQml 2.1 # 6.7
Index: qtcharts/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtcharts/distinfo,v
diff -u -p -r1.13 distinfo
--- qtcharts/distinfo 9 Dec 2025 10:37:32 -0000 1.13
+++ qtcharts/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtcharts-everywhere-src-6.10.1.tar.xz) = F5kieAF8+4+v73S2HjVVnSlILflZukaTJ6RbO7ZuKvQ=
-SIZE (qt/qtcharts-everywhere-src-6.10.1.tar.xz) = 4651684
+SHA256 (qt/qtcharts-everywhere-src-6.10.2.tar.xz) = QFEWtMXt7ZgUhMTBVOs5LUS2m1hzQvEZMYEXXjCfLAA=
+SIZE (qt/qtcharts-everywhere-src-6.10.2.tar.xz) = 4651740
Index: qtconnectivity/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtconnectivity/Makefile,v
diff -u -p -r1.6 Makefile
--- qtconnectivity/Makefile 19 Jan 2026 09:48:59 -0000 1.6
+++ qtconnectivity/Makefile 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,6 @@
QT6NAME = QtConnectivity
COMMENT = Bluetooth and NFC support for Qt6
PKGSPEC = qt6-qtconnectivity-${QT6_PKGSPEC}
-REVISION = 0

SHARED_LIBS += Qt6Bluetooth 2.0 # 6.7
SHARED_LIBS += Qt6Nfc 2.0 # 6.7
Index: qtconnectivity/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtconnectivity/distinfo,v
diff -u -p -r1.13 distinfo
--- qtconnectivity/distinfo 9 Dec 2025 10:37:32 -0000 1.13
+++ qtconnectivity/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtconnectivity-everywhere-src-6.10.1.tar.xz) = e679OpDHOCDjPdxZ3tjAGOIz0U0j6qTq2/MytawhVP8=
-SIZE (qt/qtconnectivity-everywhere-src-6.10.1.tar.xz) = 1058196
+SHA256 (qt/qtconnectivity-everywhere-src-6.10.2.tar.xz) = z1jwIfMoV7W2eZzUQE72EzmezBxRVJLw9iDOM4oxGjI=
+SIZE (qt/qtconnectivity-everywhere-src-6.10.2.tar.xz) = 1058012
Index: qtdatavis3d/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdatavis3d/Makefile,v
diff -u -p -r1.7 Makefile
--- qtdatavis3d/Makefile 19 Jan 2026 09:48:59 -0000 1.7
+++ qtdatavis3d/Makefile 6 Feb 2026 15:29:25 -0000
@@ -1,7 +1,6 @@
QT6NAME = QtDataVis3D
COMMENT = Qt6 3D data visualization components
PKGSPEC = qt6-qtdatavis3d-${QT6_PKGSPEC}
-REVISION = 0

SHARED_LIBS += Qt6DataVisualization 2.0 # 6.7
SHARED_LIBS += Qt6DataVisualizationQml 1.0 # 6.7
Index: qtdatavis3d/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdatavis3d/distinfo,v
diff -u -p -r1.13 distinfo
--- qtdatavis3d/distinfo 9 Dec 2025 10:37:32 -0000 1.13
+++ qtdatavis3d/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtdatavis3d-everywhere-src-6.10.1.tar.xz) = YBx8+v1q5SUlj+W8D3WcZyN6CqYfkftx2yqcXqpQuwc=
-SIZE (qt/qtdatavis3d-everywhere-src-6.10.1.tar.xz) = 3939684
+SHA256 (qt/qtdatavis3d-everywhere-src-6.10.2.tar.xz) = t2lAi/Sj0DIgMx1d5ZY2/fl6IYMdAdP9FBw2xpg1W8E=
+SIZE (qt/qtdatavis3d-everywhere-src-6.10.2.tar.xz) = 3939368
Index: qtdeclarative/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/Makefile,v
diff -u -p -r1.28 Makefile
--- qtdeclarative/Makefile 27 Jan 2026 16:38:07 -0000 1.28
+++ qtdeclarative/Makefile 6 Feb 2026 15:29:25 -0000
@@ -4,10 +4,9 @@ USE_WXNEEDED = Yes
QT6NAME = QtDeclarative
COMMENT = Qt6 Quick and QML components
PKGSPEC = qt6-qtdeclarative-${QT6_PKGSPEC}
-REVISION = 0

SHARED_LIBS = Qt6Qml 7.0 # 6.7
-SHARED_LIBS += Qt6Quick 8.0 # 6.7
+SHARED_LIBS += Qt6Quick 8.1 # 6.7
SHARED_LIBS += Qt6QuickParticles 3.0 # 6.7
SHARED_LIBS += Qt6QuickTest 3.0 # 6.7
SHARED_LIBS += Qt6QuickWidgets 5.0 # 6.7
@@ -26,11 +25,11 @@ SHARED_LIBS += Qt6QmlXmlListModel
SHARED_LIBS += Qt6QuickControls2 3.0 # 6.7
SHARED_LIBS += Qt6QuickControls2Impl 2.0 # 6.7
SHARED_LIBS += Qt6QuickDialogs2 3.0 # 6.7
-SHARED_LIBS += Qt6QuickDialogs2QuickImpl 4.0 # 6.7
+SHARED_LIBS += Qt6QuickDialogs2QuickImpl 4.1 # 6.7
SHARED_LIBS += Qt6QuickDialogs2Utils 2.0 # 6.7
SHARED_LIBS += Qt6QuickLayouts 4.0 # 6.7
SHARED_LIBS += Qt6QuickTemplates2 7.0 # 6.7
-SHARED_LIBS += Qt6QmlCompiler 4.0 # 6.7
+SHARED_LIBS += Qt6QmlCompiler 5.0 # 6.7
SHARED_LIBS += Qt6QuickEffects 2.0 # 6.7
SHARED_LIBS += Qt6QmlNetwork 2.0 # 6.7

@@ -49,7 +48,7 @@ SHARED_LIBS += Qt6LabsPlatform
SHARED_LIBS += Qt6QmlMeta 0.0 # 0.0
SHARED_LIBS += Qt6QuickControls2FluentWinUI3StyleImpl 0.0 # 0.0
SHARED_LIBS += Qt6QuickVectorImage 0.0 # 0.0
-SHARED_LIBS += Qt6QuickVectorImageGenerator 0.0 # 0.0
+SHARED_LIBS += Qt6QuickVectorImageGenerator 1.0 # 0.0

SHARED_LIBS += Qt6LabsSynchronizer 0.0 # 0.0
SHARED_LIBS += Qt6QuickShapesDesignHelpers 0.0 # 0.0
@@ -62,6 +61,8 @@ MODULES = lang/python
CONFIGURE_STYLE = cmake

CXXFLAGS_ports-gcc = -fdelete-null-pointer-checks
+
+#CONFIGURE_ARGS += -DQT_BUILD_TESTS=ON

MODQT6_DEPS = No

Index: qtdeclarative/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/distinfo,v
diff -u -p -r1.16 distinfo
--- qtdeclarative/distinfo 9 Dec 2025 10:37:32 -0000 1.16
+++ qtdeclarative/distinfo 6 Feb 2026 15:29:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtdeclarative-everywhere-src-6.10.1.tar.xz) = T7TvuJTguWKIVDUF1peU1oS8++SUDOGB0+aBe9pUhD4=
-SIZE (qt/qtdeclarative-everywhere-src-6.10.1.tar.xz) = 37552260
+SHA256 (qt/qtdeclarative-everywhere-src-6.10.2.tar.xz) = okmRT/Zs3Nvw34tf+tmXou5tzgHMF9Q8bMVv3B0PSw8=
+SIZE (qt/qtdeclarative-everywhere-src-6.10.2.tar.xz) = 38060952
Index: qtdeclarative/patches/patch-src_qml_configure_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/patches/patch-src_qml_configure_cmake,v
diff -u -p -r1.4 patch-src_qml_configure_cmake
--- qtdeclarative/patches/patch-src_qml_configure_cmake 24 Oct 2024 09:02:36 -0000 1.4
+++ qtdeclarative/patches/patch-src_qml_configure_cmake 6 Feb 2026 15:29:25 -0000
@@ -10,4 +10,4 @@ Index: src/qml/configure.cmake
+ AUTODETECT NOT IOS AND NOT TVOS AND NOT OPENBSD
CONDITION ( ( TEST_architecture_arch STREQUAL i386 AND QT_FEATURE_sse2 ) OR
( TEST_architecture_arch STREQUAL x86_64 AND QT_FEATURE_sse2 ) OR
- ( TEST_architecture_arch STREQUAL arm AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR
+ ( TEST_architecture_arch STREQUAL arm AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX OR VXWORKS ) ) OR
Index: qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h
===================================================================
RCS file: /cvs/ports/x11/qt6/qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h,v
diff -u -p -r1.7 patch-src_qml_jit_qv4assemblercommon_p_h
--- qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h 9 Dec 2025 10:37:32 -0000 1.7
+++ qtdeclarative/patches/patch-src_qml_jit_qv4assemblercommon_p_h 6 Feb 2026 15:29:25 -0000
@@ -6,7 +6,7 @@ Index: src/qml/jit/qv4assemblercommon_p.

#if defined(Q_PROCESSOR_X86_64) || defined(ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES)
-#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_VXWORKS) || defined(Q_OS_HURD)
-+#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_VXWORKS) || defined(Q_OS_HURD)
++#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_VXWORKS) || defined(Q_OS_HURD)

class PlatformAssembler_X86_64_SysV : public JSC::MacroAssembler<JSC::MacroAssemblerX86_64>
{
Index: qtdeclarative/patches/patch-src_qml_jsruntime_qv4lookup_p_h
===================================================================
RCS file: qtdeclarative/patches/patch-src_qml_jsruntime_qv4lookup_p_h
diff -N qtdeclarative/patches/patch-src_qml_jsruntime_qv4lookup_p_h
--- qtdeclarative/patches/patch-src_qml_jsruntime_qv4lookup_p_h 9 Dec 2025 21:00:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-From 9c6b2b78e9076f1c2676aa0c41573db9ca480654 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Tue, 02 Dec 2025 17:42:30 +0100
-Subject: [PATCH] QtQml: Invalidate fallback lookups after each call from AOT code
-
-Fallback property lookups are created for completely dynamic
-metaobjects. Anything about them may change between any two calls.
-
-Pick-to: 6.8 6.5
-Fixes: QTBUG-142331
-Change-Id: Ib732c37a6f27ab8105bea0eeae000af7eb9c36d7
-Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-(cherry picked from commit 9af6d2d6d0046b3c8369e15eb4791957cdc7ab7b)
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-
-Index: src/qml/jsruntime/qv4lookup_p.h
---- src/qml/jsruntime/qv4lookup_p.h.orig
-+++ src/qml/jsruntime/qv4lookup_p.h
-@@ -159,6 +159,10 @@ struct Q_QML_EXPORT Lookup {
- const QQmlPropertyData *propertyData;
- } qobjectMethodLookup;
- struct {
-+ // NB: None of this is actually cache-able. The metaobject may change at any time.
-+ // We invalidate this data every time the lookup is invoked and thereby force a
-+ // re-initialization next time.
-+
- quintptr isConstant; // This is a bool, encoded as 0 or 1. Both values are ignored by gc
- quintptr metaObject; // a (const QMetaObject* & 1) or nullptr
- int coreIndex;
Index: qtdeclarative/patches/patch-src_qml_qml_qqml_cpp
===================================================================
RCS file: qtdeclarative/patches/patch-src_qml_qml_qqml_cpp
diff -N qtdeclarative/patches/patch-src_qml_qml_qqml_cpp
--- qtdeclarative/patches/patch-src_qml_qml_qqml_cpp 9 Dec 2025 21:00:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,79 +0,0 @@
-From 9c6b2b78e9076f1c2676aa0c41573db9ca480654 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Tue, 02 Dec 2025 17:42:30 +0100
-Subject: [PATCH] QtQml: Invalidate fallback lookups after each call from AOT code
-
-Fallback property lookups are created for completely dynamic
-metaobjects. Anything about them may change between any two calls.
-
-Pick-to: 6.8 6.5
-Fixes: QTBUG-142331
-Change-Id: Ib732c37a6f27ab8105bea0eeae000af7eb9c36d7
-Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-(cherry picked from commit 9af6d2d6d0046b3c8369e15eb4791957cdc7ab7b)
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-
-Index: src/qml/qml/qqml.cpp
---- src/qml/qml/qqml.cpp.orig
-+++ src/qml/qml/qqml.cpp
-@@ -1377,16 +1377,16 @@ struct FallbackPropertyQmlData
-
- static FallbackPropertyQmlData findFallbackPropertyQmlData(QV4::Lookup *lookup, QObject *object)
- {
-+ // We've just initialized the lookup. So everything must be fine here.
-+
- QQmlData *qmlData = QQmlData::get(object);
-- if (qmlData && qmlData->isQueuedForDeletion)
-- return {qmlData, nullptr, PropertyResult::Deleted};
-
-+ Q_ASSERT(!qmlData || !qmlData->isQueuedForDeletion);
- Q_ASSERT(!QQmlData::wasDeleted(object));
-
- const QMetaObject *metaObject
- = reinterpret_cast<const QMetaObject *>(lookup->qobjectFallbackLookup.metaObject - 1);
-- if (!metaObject || metaObject != object->metaObject())
-- return {qmlData, nullptr, PropertyResult::NeedsInit};
-+ Q_ASSERT(metaObject == object->metaObject());
-
- return {qmlData, metaObject, PropertyResult::OK};
- }
-@@ -2576,6 +2576,7 @@ bool AOTCompiledContext::loadScopeObjectPropertyLookup
- break;
- case QV4::Lookup::Call::ContextGetterScopeObjectPropertyFallback:
- result = loadFallbackProperty(lookup, qmlScopeObject, target, this);
-+ lookup->call = QV4::Lookup::Call::ContextGetterGeneric;
- break;
- default:
- return false;
-@@ -2607,6 +2608,7 @@ bool AOTCompiledContext::writeBackScopeObjectPropertyL
- break;
- case QV4::Lookup::Call::ContextGetterScopeObjectPropertyFallback:
- result = writeBackFallbackProperty(lookup, qmlScopeObject, source);
-+ lookup->call = QV4::Lookup::Call::ContextGetterGeneric;
- break;
- default:
- return false;
-@@ -2807,6 +2809,7 @@ bool AOTCompiledContext::getObjectLookup(uint index, Q
- result = lookup->asVariant
- ? loadFallbackAsVariant(lookup, object, target, this)
- : loadFallbackProperty(lookup, object, target, this);
-+ lookup->call = QV4::Lookup::Call::GetterGeneric;
- break;
- default:
- return false;
-@@ -2841,6 +2844,7 @@ bool AOTCompiledContext::writeBackObjectLookup(uint in
- result = lookup->asVariant
- ? writeBackFallbackAsVariant(lookup, object, source)
- : writeBackFallbackProperty(lookup, object, source);
-+ lookup->call = QV4::Lookup::Call::GetterGeneric;
- break;
- default:
- return false;
-@@ -3001,6 +3005,7 @@ bool AOTCompiledContext::setObjectLookup(uint index, Q
- result = lookup->asVariant
- ? storeFallbackAsVariant(engine->handle(), lookup, object, value)
- : storeFallbackProperty(lookup, object, value);
-+ lookup->call = QV4::Lookup::Call::SetterGeneric;
- break;
- default:
- return false;
Index: qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_CMakeLists_txt
===================================================================
RCS file: qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_CMakeLists_txt
diff -N qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_CMakeLists_txt
--- qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_CMakeLists_txt 9 Dec 2025 21:00:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-From 9c6b2b78e9076f1c2676aa0c41573db9ca480654 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Tue, 02 Dec 2025 17:42:30 +0100
-Subject: [PATCH] QtQml: Invalidate fallback lookups after each call from AOT code
-
-Fallback property lookups are created for completely dynamic
-metaobjects. Anything about them may change between any two calls.
-
-Pick-to: 6.8 6.5
-Fixes: QTBUG-142331
-Change-Id: Ib732c37a6f27ab8105bea0eeae000af7eb9c36d7
-Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-(cherry picked from commit 9af6d2d6d0046b3c8369e15eb4791957cdc7ab7b)
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-
-Index: tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
---- tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt.orig
-+++ tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
-@@ -26,6 +26,7 @@ set(cpp_sources
- multiforeign.h
- objectwithmethod.h
- person.cpp person.h
-+ propertymap.h
- qmlusing.h
- recursiveObject.h
- refuseWrite.h
-@@ -279,6 +280,7 @@ set(qml_files
- popContextAfterRet.qml
- prefixedMetaType.qml
- pressAndHoldButton.qml
-+ propertyMap.qml
- qmlUsing.qml
- qtbug113150.qml
- qtfont.qml
Index: qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertyMap_qml
===================================================================
RCS file: qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertyMap_qml
diff -N qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertyMap_qml
--- qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertyMap_qml 9 Dec 2025 21:00:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-From 9c6b2b78e9076f1c2676aa0c41573db9ca480654 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Tue, 02 Dec 2025 17:42:30 +0100
-Subject: [PATCH] QtQml: Invalidate fallback lookups after each call from AOT code
-
-Fallback property lookups are created for completely dynamic
-metaobjects. Anything about them may change between any two calls.
-
-Pick-to: 6.8 6.5
-Fixes: QTBUG-142331
-Change-Id: Ib732c37a6f27ab8105bea0eeae000af7eb9c36d7
-Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-(cherry picked from commit 9af6d2d6d0046b3c8369e15eb4791957cdc7ab7b)
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-
-Index: tests/auto/qml/qmlcppcodegen/data/propertyMap.qml
---- tests/auto/qml/qmlcppcodegen/data/propertyMap.qml.orig
-+++ tests/auto/qml/qmlcppcodegen/data/propertyMap.qml
-@@ -0,0 +1,6 @@
-+pragma Strict
-+import TestTypes
-+
-+WithPropertyMap {
-+ objectName: map.foo
-+}
Index: qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertymap_h
===================================================================
RCS file: qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertymap_h
diff -N qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertymap_h
--- qtdeclarative/patches/patch-tests_auto_qml_qmlcppcodegen_data_propertymap_h 9 Dec 2025 21:00:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-From 9c6b2b78e9076f1c2676aa0c41573db9ca480654 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Tue, 02 Dec 2025 17:42:30 +0100
-Subject: [PATCH] QtQml: Invalidate fallback lookups after each call from AOT code
-
-Fallback property lookups are created for completely dynamic
-metaobjects. Anything about them may change between any two calls.
-
-Pick-to: 6.8 6.5
-Fixes: QTBUG-142331
-Change-Id: Ib732c37a6f27ab8105bea0eeae000af7eb9c36d7
-Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
-(cherry picked from commit 9af6d2d6d0046b3c8369e15eb4791957cdc7ab7b)
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-
-Index: tests/auto/qml/qmlcppcodegen/data/propertymap.h
---- tests/auto/qml/qmlcppcodegen/data/propertymap.h.orig
-+++ tests/auto/qml/qmlcppcodegen/data/propertymap.h
-@@ -0,0 +1,40 @@
-+// Copyright (C) 2025 The Qt Company Ltd.
-+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-+
-+#ifndef PROPERTYMAP_H
-+#define PROPERTYMAP_H
-+
-+#include <QtCore/qobject.h>
-+#include <QtQml/qqml.h>
-+#include <QtQml/qqmlpropertymap.h>
-+
-+class WithPropertyMap : public QObject
-+{
-+ Q_OBJECT
-+ QML_ELEMENT
-+ Q_PROPERTY(QQmlPropertyMap *map READ map NOTIFY mapChanged)
-+public:
-+ WithPropertyMap(QObject *parent = nullptr)
-+ : QObject(parent)
-+ , m_map(new QQmlPropertyMap(this))
-+ {
-+ }
-+
-+ QQmlPropertyMap *map() const { return m_map; }
-+
-+ void setProperties(const QVariantHash &properties)
-+ {
-+ delete m_map;
-+ m_map = new QQmlPropertyMap(this);
-+ m_map->insert(properties);
-+ emit mapChanged();
-+ }
-+
-+signals:
-+ void mapChanged();
-+
-+private:
-+ QQmlPropertyMap *m_map = nullptr;
-+};
-+
-+

No comments:

Post a Comment