From 1fda6109c0c302d3b2d2ccb05802391e421e64d6 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 28 Nov 2023 14:45:30 +0000 Subject: Doc: Fix documentation build configuration The custom qmake documentation build target did not correctly locate private include paths for Qt modules. Fix this by replacing dashes with underscores (e.g. qtcore-private -> qtcore_private) before querying the paths. Remove duplicate entry for qtcore-private (it's already added at top level). In ifw.qdocconf, fix relative additional include paths. Remove all non-existent paths from the configuration. Use the correct URL for the online documentation. Remove the now-obsolete custom module header, and let QDoc build an artificial one based on 'headerdirs'. In passing, fix minor issues in the documentation sources. Change-Id: I5cdbd64307448014fa8b73a70378627fdb89b942 Reviewed-by: Katja Marttila --- doc/doc.pri | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'doc/doc.pri') diff --git a/doc/doc.pri b/doc/doc.pri index 5f17fa26c..4f6a07d6f 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,4 +1,4 @@ -QT += core-private widgets concurrent network qml xml +QT += widgets concurrent network qml xml DOC_TARGETDIR = html INSTALL_DOC_PATH = $$IFW_BUILD_TREE/doc/$$DOC_TARGETDIR @@ -29,7 +29,8 @@ DOC_QCH_INSTALLDIR = $$INSTALL_DOC_PATH for (include_path, INCLUDEPATH): \ DOC_INCLUDES += -I $$shell_quote($$include_path) for (module, QT) { - MOD_INCLUDES = $$eval(QT.$${module}.includes) + MOD = $$replace(module, \-,_) + MOD_INCLUDES = $$eval(QT.$${MOD}.includes) for (include_path, MOD_INCLUDES): \ DOC_INCLUDES += -I $$shell_quote($$include_path) } -- cgit v1.2.3