Skip to content

Commit d0f1a2e

Browse files
paulwickingQt Cherry-pick Bot
authored andcommitted
configure: Move QDoc clang versions into module
Previously, QDoc’s minimum and explicitly supported Clang versions were defined in `.cmake.conf`, mixing tool-specific policy with repo-global settings. These values also lived far from the QDoc configure logic and messages that consume them. This made updates easy to miss during QDoc changes and forced edits to the top-level file for QDoc-only adjustments, adding noise to reviews. This change introduces `src/qdoc/cmake/QDocConfiguration.cmake` and moves QDOC_MINIMUM_CLANG_VERSION and QDOC_SUPPORTED_CLANG_VERSIONS there. `configure.cmake` now includes this module alongside `QDocConfigureMessages.cmake`, and the top-level definitions are removed. Behavior is unchanged. The configuration is now localized with the rest of QDoc’s CMake logic, improving discoverability and making future edits safer. Task-number: QTBUG-137569 Pick-to: 6.8 Change-Id: I3ff0f8f1a9f19064b039c860adf6cae2e94aed47 Reviewed-by: Joerg Bornemann <[email protected]> (cherry picked from commit 2bf4226) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 91c40ac)
1 parent b351de9 commit d0f1a2e

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

.cmake.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
set(QT_REPO_MODULE_VERSION "6.9.3")
22
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
33
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
4-
set(QDOC_MINIMUM_CLANG_VERSION "17")
5-
set(QDOC_SUPPORTED_CLANG_VERSIONS
6-
"20.1" "19.1" "18.1" "17.0"
7-
)
84
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
95
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1")

configure.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Copyright (C) 2022 The Qt Company Ltd.
22
# SPDX-License-Identifier: BSD-3-Clause
33

4+
# Include QDoc-specific configuration early (needed for feature definitions)
5+
include(${CMAKE_CURRENT_LIST_DIR}/src/qdoc/cmake/QDocConfiguration.cmake)
6+
47
#### Tests
58

69
qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Copyright (C) 2025 The Qt Company Ltd.
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
4+
# QDoc-specific configuration variables
5+
6+
# Minimum supported Clang version for QDoc
7+
set(QDOC_MINIMUM_CLANG_VERSION "17")
8+
9+
# List of explicitly supported Clang versions for QDoc
10+
set(QDOC_SUPPORTED_CLANG_VERSIONS
11+
"20.1" "19.1" "18.1" "17.0"
12+
)
13+

0 commit comments

Comments
 (0)