[qt/qt/qtbase]: Summary of bulk changes made
KDE Git Services - Bulk Change <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git repository change summary for qt/qt/qtbase Pushed by mirror-service into branch 'dev'. Changed from 59c85b2ecd3c0c25d242a7d7ab6c8fc477f882cf to dd01472020a13471f34cfe58222a989216c13efe Acknowledgement was received that this change introduces only existing code that has been pushed to another public open source repository. This change contains the following new commits: Git commit 264665a312b8aa9f27e5685436311f1ab8aa87d7 by Michal Klocek on 16/08/2026 at 12:32.. CMake: Add support for overriding Qt6ConfigVersion.cmake In QtWebEngine we would like to support the following syntax: find_package(Qt6 6.140 COMPONENTS WebEngineCore ...) The idea is that the above call should only work if the requested version is specified exclusively for QtWebEngine components (WebEngineCore, WebEngineWidgets or WebEngineQuick). Adding any other component will fail as the version would be ambiguous. If the call does not match the above requirements, it would simply include the base Qt6ConfigVersionImpl file. To allow that, Qt6ConfigVersion.cmake should support being overridden. Add an ALLOW_OVERRIDE_FILES to qt_internal_write_qt_package_version_file and use it for the Qt6 call. This injects additional code into the 'Qt6<module>ConfigVersion.cmake' file which globs ConfigVersionOverrides dir for special override files and includes them. The override files should be called according to the scheme: Qt6<module>ConfigVersionOverride_[0-9][0-9][0-9][0-9]_<ident>.cmake The digits are included in the name to allow sorting priority of inclusion. The identifier can be used to distinguish who installed the file. These files can do any necessary custom version checks. qtwebengine can install such a file next to the regular file, and implement the custom logic there. Due to the glob, this allows other repos (or packagers) to customize the behavior of the version check of the Qt6 package. A runtime opt out for this behavior can be enabled by setting the QT_NO_CONFIG_VERSION_OVERRIDE_FILES variable before finding Qt6. Packagers can also disable the new behavior at configure time of qtbase (the code won't be injected) by setting QT_NO_INJECT_CONFIG_VERSION_OVERRIDE_FILES to ON. Pick-to: 6.12 Task-number: QTBUG-103500 Change-Id: I91a8da816a8b64ec0351aaf0e685381aa6c5d7ca Reviewed-by: Alexandru Croitor <[email protected]> https://invent.kde.org/qt/qt/qtbase/-/commit/264665a312b8aa9f27e5685436311f1ab8aa87d7 Git commit dd01472020a13471f34cfe58222a989216c13efe by Michal Klocek on 16/08/2026 at 12:32.. Add cmake test suite for configversionoverride Use RunCMake infra and generate on the fly config versions and overrides. Pick-to: 6.12 Change-Id: I4ceb87d2ae7cba0531ad5b8cc1e0c9e19fd6958c Reviewed-by: Alexandru Croitor <[email protected]> https://invent.kde.org/qt/qt/qtbase/-/commit/dd01472020a13471f34cfe58222a989216c13efe