3 files changed, 21 insertions, 24 deletions
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}")