No description
- C++ 94.1%
- CMake 2.6%
- HTML 2%
- XSLT 0.7%
- C 0.2%
- Other 0.1%
|
Alexandru Croitor
a7b0ba6a77
QDoc: Fix tst_validateQdocOutputFiles doc warnings on macOS
The tst_validateQdocOutputFiles qmlsingleton test case started failing in a macOS framework prefix build after a dependency update, with two doc warnings, due to some include path issues. The test header includes <QtQml/qqml.h>, which transitively includes <QtQmlIntegration/qqmlintegration.h>. The include paths passed to qdoc are generated from the test target's INCLUDE_DIRECTORIES, but the target didn't link to Qt::Qml, so no Qml or QmlIntegration include paths were provided. In a non-prefix build this accidentally works because all module headers live in subdirectories under the global include/ directory that is already on Core's include path. In a framework prefix build, QtQml is a framework and QtQmlIntegration is a header-only module under include/QtQmlIntegration. Due to some qtbase changes in how headers are created for frameworks, the global "include/" path is no longer passed, so the qdoc clang parser fails with: qt.qdoc.clang: <install>/lib/QtQml.framework/Headers/qqmlregistration.h:9:10: error: 'QtQmlIntegration/qqmlintegration.h' file not found qdoc then fails to process the class constructors and can't tie their documentation to anything and that results in some doc warnings. Fix this by explicitly linking Qt6::Qml into the test target. It publicly depends on Qt6::QmlIntegration, whose interface include directories contain the path to resolve <QtQmlIntegration/qqmlintegration.h>. Pick-to: 6.12 Fixes: QTBUG-148305 Change-Id: I2e9b03cddc1a8acde70d60a3bb2fc6db6197607a Reviewed-by: Paul Wicking <paul.wicking@qt.io> |
||
|---|---|---|
| cmake | CMake: Add HarmonyOS support | |
| coin | Run Axivion analysis only for security critical files | |
| dist | Remove year from Qt Copyright in REUSE.toml | |
| examples | Apple/macOS: Replace deprecated Q_OS_MAC with Q_OS_APPLE or Q_OS_MACOS | |
| LICENSES | Add REUSE.toml files and missing licenses | |
| src | QDoc: Fix tst_validateQdocOutputFiles doc warnings on macOS | |
| tests | lupdate: Read .qrc files as UTF-8 | |
| util/recolordocsicons | recolordocsicons: Add the tool and a README | |
| .cmake.conf | Bump version to 6.13.0 | |
| .gitattributes | Update the git-archive export options | |
| .gitignore | Add compile_commands.json to gitignore file | |
| .gitmodules | Revert "Use git protocol when cloning submodules" | |
| .gitreview | Add .gitreview file | |
| .tag | Update the git-archive export options | |
| CMakeLists.txt | QtHelp: Add optional dependency to Qt::Concurrent | |
| configure.cmake | CMake: Add HarmonyOS support | |
| CONTRIBUTING.md | Add CONTRIBUTING.md file | |
| dependencies.yaml | Update dependencies on 'dev' in qt/qttools | |
| licenseRule.json | QDoc: Add multi-module test driver for cross-module fixtures | |
| qt_cmdline.cmake | CMake: Add empty qt_cmdline.cmake for top-level configure to work | |
| REUSE.toml | QDoc: Cover annotated-examples in the catalog-pages fixture | |