blob: 3ca75c9e3894e752ed549348dc399f69825c8ca8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From c927beace6e21e10aed680268c95f9f96efabc7c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 11 Mar 2026 01:07:36 +0100
Subject: [PATCH 2/2] Allow using LLVM 22
Change-Id: I17d37fbff1b3b75797e0fb22361252327f32fb8e
---
src/qdoc/cmake/QDocConfiguration.cmake | 2 +-
src/qdoc/qdoc/CMakeLists.txt | 1 +
src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp | 7 ++++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/qdoc/cmake/QDocConfiguration.cmake b/src/qdoc/cmake/QDocConfiguration.cmake
index 72d27db9e..8a3cba463 100644
--- a/src/qdoc/cmake/QDocConfiguration.cmake
+++ b/src/qdoc/cmake/QDocConfiguration.cmake
@@ -8,7 +8,7 @@ set(QDOC_MINIMUM_CLANG_VERSION "17")
# List of explicitly supported Clang versions for QDoc
set(QDOC_SUPPORTED_CLANG_VERSIONS
- "21.1" "20.1" "19.1" "18.1" "17.0.6"
+ "22.1" "22.0" "21.1" "20.1" "19.1" "18.1" "17.0.6"
)
# Check for QDoc coverage dependencies
diff --git a/src/qdoc/qdoc/CMakeLists.txt b/src/qdoc/qdoc/CMakeLists.txt
index 81accae82..ceffcd05a 100644
--- a/src/qdoc/qdoc/CMakeLists.txt
+++ b/src/qdoc/qdoc/CMakeLists.txt
@@ -107,6 +107,7 @@ qt_internal_add_tool(${target_name}
QT_NO_KEYWORDS
# To provide the ability to workaround version-specific Clang issues.
# A re-export of (LLVM|CLANG)_VERSION_MAJOR done in WrapLibClang.cmake
+ QT_NO_EMIT
LIBCLANG_VERSION_MAJOR=${QT_LIB_CLANG_VERSION_MAJOR}
)
qt_internal_return_unless_building_tools()
diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
index be8e01c62..8b1983212 100644
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
@@ -42,7 +42,12 @@
#include <clang/Lex/Lexer.h>
#include <llvm/Support/Casting.h>
-#include "clang/AST/QualTypeNames.h"
+#if LIBCLANG_VERSION_MAJOR >= 22
+// LLVM 22 provides a compatible QualTypeNames implementation in libclang.
+# include <clang/AST/QualTypeNames.h>
+#else
+# include "clang/AST/QualTypeNames.h"
+#endif
#include "template_declaration.h"
#include <cstdio>
--
2.54.0
|