You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
CMake: Drop 'git' in VERSION argument for dev builds
LLVM has a strict compatibility check in the CMake packages they
provide. Therefore, we cannot pass a non-conformant version string,
such as `21.0.0git`, to the `find_package()` call for Clang or LLVM.
QDoc carries a fork of `clang/AST/QualTypeNames` due to upstream changes
between LLVM 15 and LLVM 16 that were deemed incompatible with QDoc's
needs. As this class sees upstream modifications that break compilation,
there's a need to bisect LLVM to track down the offending upstream
change, so that QDoc's implementation can be modified to work correctly
alongside newer versions of LLVM. These builds contain version strings
that contain 'git' as a suffix, and thus break the developer experience
in qttools.git.
To mitigate this problem, this change strips the suffix by a simple
regular expression based string replacement. The new behavior is gated
with `QT_FEATURE_developer_build` (the feature flag defined by a
`-developer-build` configuration of qtbase.git). The rationale is that,
as this is strictly speaking a convenience for me, myself, and I, it
should not be the default behavior of the CMake script, and if run in
an environment that's a developer build, it's reasonable to expect that
the developer responsible for configuring qttools.git is able to find
and understand why this happens.
This change extends the logic implemented in
914e00b and is, as such, cherry-picked
as far back as to the branches that change targeted.
Task-number: QTBUG-139407
Pick-to: 6.8
Change-Id: Id5dea0678037cc5f86343b7aa0421b27c6ad13c0
Reviewed-by: Topi Reiniö <[email protected]>
Reviewed-by: David Boddie <[email protected]>
(cherry picked from commit 39f0f48)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit f61c47e)
Reviewed-by: Paul Wicking <[email protected]>
0 commit comments