2
0
Fork
You've already forked qttools
0
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>
2026年07月15日 17:00:38 +00:00
cmake CMake: Add HarmonyOS support 2026年06月08日 14:14:21 +00:00
coin Run Axivion analysis only for security critical files 2026年04月23日 11:07:15 +00:00
dist Remove year from Qt Copyright in REUSE.toml 2025年07月11日 12:34:41 +02:00
examples Apple/macOS: Replace deprecated Q_OS_MAC with Q_OS_APPLE or Q_OS_MACOS 2026年04月09日 21:36:46 +02:00
LICENSES Add REUSE.toml files and missing licenses 2024年10月30日 21:00:51 +01:00
src QDoc: Fix tst_validateQdocOutputFiles doc warnings on macOS 2026年07月15日 17:00:38 +00:00
tests lupdate: Read .qrc files as UTF-8 2026年06月16日 03:41:38 +00:00
util/recolordocsicons recolordocsicons: Add the tool and a README 2023年12月19日 08:14:49 +00:00
.cmake.conf Bump version to 6.13.0 2026年06月04日 20:22:16 +00:00
.gitattributes Update the git-archive export options 2012年09月03日 19:54:35 +02:00
.gitignore Add compile_commands.json to gitignore file 2024年10月10日 10:04:53 +02:00
.gitmodules Revert "Use git protocol when cloning submodules" 2026年02月16日 14:18:42 +00:00
.gitreview Add .gitreview file 2025年03月24日 14:21:50 +00:00
.tag Update the git-archive export options 2012年09月03日 19:54:35 +02:00
CMakeLists.txt QtHelp: Add optional dependency to Qt::Concurrent 2026年03月26日 13:48:11 +01:00
configure.cmake CMake: Add HarmonyOS support 2026年06月08日 14:14:21 +00:00
CONTRIBUTING.md Add CONTRIBUTING.md file 2026年04月29日 10:22:00 +00:00
dependencies.yaml Update dependencies on 'dev' in qt/qttools 2026年07月09日 19:22:35 +00:00
licenseRule.json QDoc: Add multi-module test driver for cross-module fixtures 2026年05月20日 14:27:12 +00:00
qt_cmdline.cmake CMake: Add empty qt_cmdline.cmake for top-level configure to work 2020年09月17日 15:55:55 +02:00
REUSE.toml QDoc: Cover annotated-examples in the catalog-pages fixture 2026年05月07日 09:20:57 +00:00