1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Add an option to pass --showinternal to qdoc

Browse Source 
This adds an SHOW_INTERNAL option to qt_internal_add_docs that
passes the --showinternal option to qdoc.

The option can also be set for all calls by setting either the CMake
variable QT_QDOC_SHOW_INTERNAL or the environment variable.

Pick-to: 6.8
Fixes: QTBUG-118176
Change-Id: If72c4072e10bc5f12b0431a5f8abea6ee1e2bd69
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0b7ff3d0a7be7b8df6184cde5ca33bb681790131)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2025-01-22 12:11:12 +01:00 committed by Qt Cherry-pick Bot
parent 98d5581e16
commit 3f5df82334
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/QtDocsHelpers.cmake
View File

@ -41,6 +41,8 @@ endfunction()
# #
# QDOC_GENERATE_EXTRA_ARGS - extra command-line arguments to pass to qdoc in the generate phase. # QDOC_GENERATE_EXTRA_ARGS - extra command-line arguments to pass to qdoc in the generate phase.
# #
# SHOW_INTERNAL - if set, the --showinternal option is passed to qdoc.
#
# Additional environment variables considered: # Additional environment variables considered:
# QT_INSTALL_DOCS - directory path where the qt docs were expected to be installed, used for # QT_INSTALL_DOCS - directory path where the qt docs were expected to be installed, used for
# linking to other built docs. If not set, defaults to the qtbase or qt5 build directory, or the # linking to other built docs. If not set, defaults to the qtbase or qt5 build directory, or the
@ -48,6 +50,9 @@ endfunction()
# #
# QT_QDOC_EXTRA_ARGS, QT_QDOC_PREPARE_EXTRA_ARGS, QT_QDOC_GENERATE_EXTRA_ARGS - same as the options # QT_QDOC_EXTRA_ARGS, QT_QDOC_PREPARE_EXTRA_ARGS, QT_QDOC_GENERATE_EXTRA_ARGS - same as the options
# but can be set as either environment or cmake variables. # but can be set as either environment or cmake variables.
#
# QT_QDOC_SHOW_INTERNAL - same as the option but can be set as either an environment or
# cmake variable.
function(qt_internal_add_docs) function(qt_internal_add_docs)
if(NOT QT_BUILD_DOCS) if(NOT QT_BUILD_DOCS)
return() return()
@ -72,7 +77,9 @@ function(qt_internal_add_docs)
set(target ${ARGV0}) set(target ${ARGV0})
set(qdoc_conf_path ${ARGV1}) set(qdoc_conf_path ${ARGV1})
set(opt_args "") set(opt_args
SHOW_INTERNAL
)
set(single_args "") set(single_args "")
set(multi_args set(multi_args
INDEX_DIRECTORIES INDEX_DIRECTORIES
@ -95,6 +102,14 @@ function(qt_internal_add_docs)
endforeach() endforeach()
endif() endif()
set(show_internal_env FALSE)
if(DEFINED ENV{QT_QDOC_SHOW_INTERNAL})
set(show_internal_env $ENV{QT_QDOC_SHOW_INTERNAL})
endif()
if(arg_SHOW_INTERNAL OR QT_QDOC_SHOW_INTERNAL OR show_internal_env)
list(APPEND qdoc_extra_args "--showinternal")
endif()
if(arg_QDOC_EXTRA_ARGS) if(arg_QDOC_EXTRA_ARGS)
list(APPEND qdoc_extra_args ${arg_QDOC_EXTRA_ARGS}) list(APPEND qdoc_extra_args ${arg_QDOC_EXTRA_ARGS})
endif() endif()