6 files changed, 37 insertions, 37 deletions
diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile
index 63b3deb3d8df..706786478908 100644
--- a/devel/qt6-tools/Makefile
+++ b/devel/qt6-tools/Makefile
@@ -10,22 +10,24 @@ BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
-USES=		cmake compiler:c++17-lang gl llvm:min=17,max=20,lib,noexport \
+USES=		cmake compiler:c++17-lang gl llvm:min=17,max=21,lib,noexport \
 		python:build qt-dist:6
 USE_GL=		opengl
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 USE_QT=		base declarative sqldriver-sqlite:run
 
-# QDOC_USER_CLANG_VERSION is an unofficial CMake variable intended to override
-# the list of supported LLVM versions, i.e., QDOC_SUPPORTED_CLANG_VERSIONS in
-# .cmake.conf with the chosen version of LLVM. We must be careful here and adjust
-# llvm min/max in USES to align with the versions of LLVM that future releases
-# support. LLVM_VERSION only provides the major version, but at least the minor
-# version must also be passed, hence the use of "black magic" to determine this
-# value, which does not respect relative paths.
 CMAKE_ARGS=	-DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
-		-DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" \
-		-DQDOC_USER_CLANG_VERSION:STRING="`${MAKE} -C ${PORTSDIR}/devel/llvm${LLVM_VERSION} -VDISTVERSION:R`"
+		-DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm"
+# QDOC_USER_CLANG_VERSION is a custom CMake variable intended to override the
+# list of supported LLVM versions, i.e., QDOC_SUPPORTED_CLANG_VERSIONS in
+# src/qdoc/cmake/QDocConfiguration.cmake with the chosen version of LLVM.
+# Otherwise, the numerically greatest version found would be used. We must be
+# careful here and adjust llvm min/max in USES to align with the versions
+# of LLVM that future releases support. We also need to supply at least a
+# major.minor version of llvm for this variable. Since LLVM_VERSION only provides
+# the major version, we pass the full version via a command and let CMake process
+# it during the configure stage.
+CMAKE_ARGS+=	-DQDOC_USER_CLANG_VERSION:STRING="`${LLVM_CONFIG} --version`"
 
 post-install:
 # Install symlinks for user-facing tools
diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo
index 818f2f0992b1..bef1029813a2 100644
--- a/devel/qt6-tools/distinfo
+++ b/devel/qt6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1756196635
-SHA256 (KDE/Qt/6.9.2/qttools-everywhere-src-6.9.2.tar.xz) = d8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489
-SIZE (KDE/Qt/6.9.2/qttools-everywhere-src-6.9.2.tar.xz) = 10330412
+TIMESTAMP = 1759303238
+SHA256 (KDE/Qt/6.9.3/qttools-everywhere-src-6.9.3.tar.xz) = 0cf7ab0e975fc57f5ce1375576a0a76e9ede25e6b01db3cf2339cd4d9750b4e9
+SIZE (KDE/Qt/6.9.3/qttools-everywhere-src-6.9.3.tar.xz) = 10334740
diff --git a/devel/qt6-tools/files/patch-.cmake.conf b/devel/qt6-tools/files/patch-.cmake.conf
deleted file mode 100644
index ec629a036b7e..000000000000
--- a/devel/qt6-tools/files/patch-.cmake.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-Supply the version of LLVM we are intending to use via QDOC_USER_CLANG_VERSION,
-a made-up CMake varible derived from LLVM_VERSION in the port Makefile, instead
-of iterating through potential candidates. This avoids mismatches during the
-configure stage when a user has a version of LLVM installed greater than what is
-set in DEFAULT_VERSIONS.
-
-PR: 287430
-
---- .cmake.conf.orig	2025-05-29 00:19:42 UTC
-+++ .cmake.conf
-@@ -3,7 +3,7 @@ set(QDOC_SUPPORTED_CLANG_VERSIONS
- set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
- set(QDOC_MINIMUM_CLANG_VERSION "17")
- set(QDOC_SUPPORTED_CLANG_VERSIONS
--    "20.1" "19.1" "18.1" "17.0"
-+    ${QDOC_USER_CLANG_VERSION}
- )
- list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
- list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1")
diff --git a/devel/qt6-tools/files/patch-configure.cmake b/devel/qt6-tools/files/patch-configure.cmake
index e5d15fe0e715..8474226f40c6 100644
--- a/devel/qt6-tools/files/patch-configure.cmake
+++ b/devel/qt6-tools/files/patch-configure.cmake
@@ -15,11 +15,11 @@ Call Stack (most recent call first):
 
 Regressed by: https://code.qt.io/cgit/qt/qttools.git/commit/?h=6.6.0&id=ff5c080c2eb9267c43da6fafe953bf50076443c4
 
---- configure.cmake.orig	2025-02-19 09:54:25 UTC
+--- configure.cmake.orig	2025-09-25 00:29:00 UTC
 +++ configure.cmake
-@@ -1,6 +1,11 @@
- # Copyright (C) 2022 The Qt Company Ltd.
- # SPDX-License-Identifier: BSD-3-Clause
+@@ -4,6 +4,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/src/qdoc/cmake/QDocC
+ # Include QDoc-specific configuration early (needed for feature definitions)
+ include(${CMAKE_CURRENT_LIST_DIR}/src/qdoc/cmake/QDocConfiguration.cmake)
  
 +#### Libraries
 +
@@ -29,7 +29,7 @@ Regressed by: https://code.qt.io/cgit/qt/qttools.git/commit/?h=6.6.0&id=ff5c080c
  #### Tests
  
  qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang)
-@@ -8,7 +13,6 @@ endif()
+@@ -11,7 +16,6 @@ endif()
  if(TARGET WrapLibClang::WrapLibClang)
      set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE)
  endif()
diff --git a/devel/qt6-tools/files/patch-src_qdoc_cmake_QDocConfiguration.cmake b/devel/qt6-tools/files/patch-src_qdoc_cmake_QDocConfiguration.cmake
new file mode 100644
index 000000000000..7f4c312efad3
--- /dev/null
+++ b/devel/qt6-tools/files/patch-src_qdoc_cmake_QDocConfiguration.cmake
@@ -0,0 +1,16 @@
+Supply the version of LLVM we are intending to use via QDOC_USER_CLANG_VERSION,
+a custom CMake varible derived from LLVM_VERSION in the port Makefile instead of
+iterating through all potential candidates. This avoids mismatches during the
+configure stage when a user has a version of LLVM installed greater than what is
+set in DEFAULT_VERSIONS.
+
+PR: 287430
+
+--- src/qdoc/cmake/QDocConfiguration.cmake.orig	2025-09-25 00:29:00 UTC
++++ src/qdoc/cmake/QDocConfiguration.cmake
+@@ -11,3 +11,5 @@ set(QDOC_SUPPORTED_CLANG_VERSIONS
+     "21.1" "20.1" "19.1" "18.1" "17.0"
+ )
+ 
++# Try user-selected version of Clang first
++list(PREPEND QDOC_SUPPORTED_CLANG_VERSIONS "${QDOC_USER_CLANG_VERSION}")
diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist
index 07be5f73c227..48f15cc3091b 100644
--- a/devel/qt6-tools/pkg-plist
+++ b/devel/qt6-tools/pkg-plist
@@ -369,6 +369,7 @@ lib/cmake/Qt6Tools/Qt6ToolsConfig.cmake
 lib/cmake/Qt6Tools/Qt6ToolsConfigVersion.cmake
 lib/cmake/Qt6Tools/Qt6ToolsConfigVersionImpl.cmake
 lib/cmake/Qt6Tools/Qt6ToolsDependencies.cmake
+lib/cmake/Qt6Tools/Qt6ToolsExtraProperties.cmake
 lib/cmake/Qt6Tools/Qt6ToolsTargets.cmake
 lib/cmake/Qt6Tools/Qt6ToolsVersionlessAliasTargets.cmake
 lib/cmake/Qt6Tools/Qt6ToolsVersionlessTargets.cmake