diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:16 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:16 +0200 |
| commit | 2d66011e197f96cf17b170fe10b6a78354d3117c (patch) | |
| tree | e4737ff487171dc946ef33d9c355de128ab8d6d5 /doc | |
| parent | 8216f5c5249db2c368434129fb6f4e35cb75edfc (diff) | |
| parent | f9e9e1f1a566511d663b32e422f7b054713e5112 (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | doc/global/cpp-doc-macros.qdocconf | 15 | ||||
| -rw-r--r-- | doc/global/html-footer.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/macros.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/qt-module-defaults-online.qdocconf | 2 |
5 files changed, 30 insertions, 2 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index bf99a1403cb..4476a5a12ac 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -11,5 +11,16 @@ foreach(dir global config) if(QT_SUPERBUILD OR "${PROJECT_NAME}" STREQUAL "QtBase") qt_path_join(destination ${QtBase_BINARY_DIR} ${INSTALL_DOCDIR}) file(COPY ${dir} DESTINATION ${destination}) + + if(NOT QT_NO_SET_QTBASE_DOC_FILE_DEPS_COPYING) + # Make sure touched doc files cause a reconfigure, so they get re-copied. + # TODO: Consider making this a build time file copy dependency. + # It is more complicated, because all documentation generation custom targets would have + # to depend on the file outputs of add_custom_command(copy), and it's not clear how the + # dependencies should be set up in that case (coarsness, use install vs build dirs, + # etc). + file(GLOB_RECURSE files LIST_DIRECTORIES FALSE "${dir}/*") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${files}) + endif() endif() endforeach() diff --git a/doc/global/cpp-doc-macros.qdocconf b/doc/global/cpp-doc-macros.qdocconf new file mode 100644 index 00000000000..5de60c20de5 --- /dev/null +++ b/doc/global/cpp-doc-macros.qdocconf @@ -0,0 +1,15 @@ +# Macros for documenting repetitive aspects of C++ classes + +# Sort groups alphabetically + +# +# Macros for swap() +# + +# \memberswap{what} +# what - a prose version of the type of object (e.g. "string", "collator", "pen") +# The function's argument name must be \a other. +macro.memberswap = \ + "\n\n" \ + "Swaps this \1 with \\a{other}. This operation is very fast and never fails." \ + "\n\n" diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 69d08b316ab..1cf052b99a1 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,7 +8,7 @@ HTML.footer = \ "</div>\n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2023 The Qt Company Ltd.\n" \ + " <abbr title=\"Copyright\">©</abbr> 2024 <span translate=\"no\">The Qt Company Ltd.</span>\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.<br/>" \ " The documentation provided herein is licensed under the terms of the" \ diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 6af394fbf70..a72cd1e850a 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -145,3 +145,5 @@ macro.cmakevariableiosonly = "\\note This variable is used only if targeting iOS #group. #Must be placed directly under a \brief command macro.techpreview = "(Technical preview)\n\n\\meta status {Technical preview}\n\\ingroup tech_preview\n" + +include(cpp-doc-macros.qdocconf) diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 4b682cfd6c9..47d39f49250 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -5,7 +5,7 @@ HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2023 The Qt Company Ltd.\n" \ + " <abbr title=\"Copyright\">©</abbr> 2024 The Qt Company Ltd.\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ |