Update package version to 6.12.0
This commit is contained in:
3 files changed
+2
-46
No files matched your search
@@ -1,6 +1,6 @@
|
||||
name: qt6-tools
|
||||
description: A cross-platform application and UI framework (Development Tools, QtHelp)
|
||||
version: 6.11.2
|
||||
version: 6.12.0
|
||||
revision: 1
|
||||
url: https://www.qt.io/
|
||||
license: FDL,GPL3,LGPL3,custom
|
||||
@@ -29,4 +29,4 @@ downloads:
|
||||
type: git
|
||||
clone_to: ${BPM_SOURCE}
|
||||
git_branch: v${BPM_PKG_VERSION}
|
||||
checksum: 8026c0462f19e9549501718152523ea223a19fd3
|
||||
checksum: 613a6fbf0a7998010ab2fda260b64066d66a021d
|
||||
@@ -6,7 +6,6 @@
|
||||
# This function is used for putting downloaded files to the correct location or applying patches
|
||||
prepare() {
|
||||
cd "$BPM_SOURCE"
|
||||
patch -Np1 -i "$BPM_WORKDIR"/llvm22.patch
|
||||
git submodule init
|
||||
git submodule update --init --recursive
|
||||
}
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
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 90f1d7c23..84ebc3a28 100644
|
||||
--- a/src/qdoc/qdoc/CMakeLists.txt
|
||||
+++ b/src/qdoc/qdoc/CMakeLists.txt
|
||||
@@ -191,6 +191,7 @@ qt_internal_add_tool(${target_name}
|
||||
DEFINES
|
||||
# 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}
|
||||
)
|
||||
|
||||
diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
||||
index 66a750a3d..3f54ddff5 100644
|
||||
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
||||
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
||||
@@ -43,7 +43,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>
|
||||
Reference in new issue
Block a user