4 files changed, 19 insertions, 2 deletions
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\">&copy;</acronym> 2023 The Qt Company Ltd.\n" \
+    "   <abbr title=\"Copyright\">&copy;</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\">&copy;</acronym> 2023 The Qt Company Ltd.\n" \
+    "   <abbr title=\"Copyright\">&copy;</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" \