summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2023-03-06 12:23:00 +0000
committerTopi Reinio <topi.reinio@qt.io>2023-03-06 14:32:57 +0000
commite5442db7411dab1edeec65d5a0e9dc3eb3b802c0 (patch)
tree9dd028846fea3c7a64691e5d18337dd5a03cb99f /tests
parent162573d4274e703cea7d95e4ea16158b3bbf710f (diff)
downloadqttools-e5442db7411dab1edeec65d5a0e9dc3eb3b802c0.tar.gz
qdoc: Add meta description header to HTML output
A meta description is an HTML element that provides a brief summary of a web page, typically displayed as part of a search engine results page. Use the \brief description for pages that have it. This should cover virtually all of the API reference as type \brief appears on module pages and therefore is rarely missing. Many overview \page's have it as well. Pick-to: 5.15 6.2 6.4 6.5 Fixes: QTBUG-111360 Change-Id: Ie403777fd895a995bbd7d717333e95c1b6b77d89 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-int.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/space.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/template/bar.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/template/baz.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/template/foo.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html1
56 files changed, 56 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html
index 974819e53..61c4fa371 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testtype.cpp -->
+ <meta name="description" content="A class inheriting another class that lives in an external doc module.">
<title>List of All Members for TestType | CrossModule</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html
index 5f7f09305..0b30007f6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testtype.cpp -->
+ <meta name="description" content="A class inheriting another class that lives in an external doc module.">
<title>TestType Class | CrossModule</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html
index 7c7cae045..2d073e237 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmoduleref.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="Namespace that has documented functions in multiple modules.">
<title>CrossModuleRef Namespace | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
index 3476daad3..a4f91eda8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- dont.cpp -->
+ <meta name="description" content="A public but undocumented class.">
<title>SeenClass Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html
index ced014be5..ebc565d99 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testheader.cpp -->
+ <meta name="description" content="A header file.">
<title>&lt;TestHeader&gt; - Test Header | HeaderFile</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html
index bb94f8299..0b33938bc 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A class in a namespace.">
<title>Test Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
index 930d20d02..e34ff0528 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A namespace.">
<title>TestQDoc Namespace | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html
index adecd9626..beb7792f7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- includefromparent.qdoc -->
+ <meta name="description" content="Abstract base QML type.">
<title>List of All Members for AbstractParent | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
index 1e81b97bc..727dcbe73 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- includefromparent.qdoc -->
+ <meta name="description" content="Abstract base QML type.">
<title>AbstractParent QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html
index 77dbd7d86..6b411b5c1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A test module page.">
<title>QDoc Test C++ Classes | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html
index d7ea47a56..23c56acef 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="QML Types for the Test module.">
<title>QDoc.Test QML Module | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html
index 03689a5e6..a6d63699b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- examples.qdoc -->
+ <meta name="description" content="Example for documenting QML types.">
<title>QML Documentation Example | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html
index ebcc86226..f413175b0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A test module page.">
<title>QDoc Test C++ Classes | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html
index 4d3461360..44d05b329 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A derived class in a namespace.">
<title>List of All Members for TestDerived | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html
index 123a33102..5a06f1d41 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A derived class in a namespace.">
<title>TestDerived Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html
index a603ae147..ea8197a32 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="QML Types for the Test module.">
<title>QDoc.Test QML Module | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
index 69c729848..2f0715651 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- qdoctests-outputfromqdocfiles.qdoc -->
+ <meta name="description" content="This page is a dumping ground for QDoc commands under test.">
<title>Exhaustive testing of QDoc commands | OutputFromQDocFiles</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
index edeadb885..b4d63e76e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- qdoctests-outputfromqdocfiles.qdoc -->
+ <meta name="description" content="This is a page for testing QDoc's link command.">
<title>Testing QDoc's link command | OutputFromQDocFiles</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
index 1f09f0f2b..61b0e8bc1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- qdoctests-outputfromqdocfiles.qdoc -->
+ <meta name="description" content="This is a simple page for testing purposes only.">
<title>Testing QDoc output from .qdoc files | OutputFromQDocFiles</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
index 8843b9474..bd6e61efd 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- parent.qdoc -->
+ <meta name="description" content="An integer value type.">
<title>int QML Value Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html
index e0a47f7c2..cc590a470 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- parent.qdoc -->
+ <meta name="description" content="Abstract base QML type.">
<title>AbstractParent QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html
index 91ad38af8..323c7b91b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- parent.qdoc -->
+ <meta name="description" content="A Child inheriting its parent.">
<title>Child QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html
index cc9aa4ecf..49c8b2730 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- DocTest.qml -->
+ <meta name="description" content="Represents a doc test case.">
<title>DocTest QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html
index b4b039291..78b4afecf 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="A QML type documented in a .cpp file.">
<title>List of All Members for Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html
index 1b196d99e..e844e84c0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-obsolete.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="A QML type documented in a .cpp file.">
<title>Obsolete Members for Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html
index 7615b3661..389c81b97 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="A QML type documented in a .cpp file.">
<title>Type QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html
index f7bb76841..85c478746 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-yetanotherchild.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- parent.qdoc -->
+ <meta name="description" content="A type inheriting from internal abstract parent.">
<title>YetAnotherChild QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html
index fd510a6a8..d58b80f59 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="Another QML type documented in a .cpp file.">
<title>List of All Members for TypeNoVersion | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html
index 9b388cd73..432085d63 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-test-nover-typenoversion.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="Another QML type documented in a .cpp file.">
<title>TypeNoVersion QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html
index 96931039f..3ab477cb2 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- ProgressBar.qml -->
+ <meta name="description" content="A component that shows the progress of an event.">
<title>ProgressBar QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html
index 183a3c571..31149d12f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- Switch.qml -->
+ <meta name="description" content="A component that can be turned on or off.">
<title>Switch QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
index 043e1fdd5..97275b63a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- TabWidget.qml -->
+ <meta name="description" content="A widget that places its children as tabs.">
<title>TabWidget QML Type | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html
index 1188ef72d..3eeea7e5e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- parent.qdoc -->
+ <meta name="description" content="Just another child inheriting a parent.">
<title>List of All Members for AnotherChild | QmlPropertyGroups</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html
index 744fc15db..20c215f86 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-parent.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- parent.qdoc -->
+ <meta name="description" content="Base QML type.">
<title>Parent QML Type | QmlPropertyGroups</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html
index 337b14b90..66bb69623 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A class in a namespace.">
<title>Test Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/space.html b/tests/auto/qdoc/generatedoutput/expected_output/space.html
index d6adc7cf0..d9007e9ff 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/space.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/space.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- space.cpp -->
+ <meta name="description" content="A namespace..&#x2e;in space.">
<title>Space Namespace | UsingDirective</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
index d5ee765d7..2e3c69d1f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testtemplate.cpp -->
+ <meta name="description" content="Another class template.">
<title>Bar Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
index 3b9048a0f..216a7c191 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testtemplate.cpp -->
+ <meta name="description" content="Class template template.">
<title>Baz Struct | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
index 8f0715b96..dba89416e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testtemplate.cpp -->
+ <meta name="description" content="Class template.">
<title>Foo Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html
index 245918d0c..681db43f1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="Templated struct.">
<title>Struct Struct | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html
index 32f0ecf45..d027a48d8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A class in a namespace.">
<title>Test Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html
index d0529ec81..fba9c899b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="Type alias that has its own reference.">
<title>Vec Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
index b83694b25..4f0997f24 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- examples.qdoc -->
+ <meta name="description" content="Example for documenting QML types.">
<title>QML Documentation Example | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html
index a6ec0f425..de488214b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- type.cpp -->
+ <meta name="description" content="QML Types for the Test module without version.">
<title>Versionless QML Module | Test</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
index 41619a1d8..cba2b33b8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A test module page.">
<title>QDoc Test C++ Classes | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html
index c3886f43e..b07a9b327 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A class in a namespace.">
<title>List of All Members for Test | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html
index 993ff93d9..00ee672f5 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A class in a namespace.">
<title>Obsolete Members for Test | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
index 482ae4cea..9374c865c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A class in a namespace.">
<title>Test Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html
index 21fdd803d..79aa845b3 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A derived class in a namespace.">
<title>List of All Members for TestDerived | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html
index 45b378d62..49f824bf1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A derived class in a namespace.">
<title>Obsolete Members for TestDerived | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
index 45d74870d..dfc11dc09 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A derived class in a namespace.">
<title>TestDerived Class | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
index 930d20d02..e34ff0528 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- testcpp.cpp -->
+ <meta name="description" content="A namespace.">
<title>TestQDoc Namespace | TestCPP</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html
index 3b140db49..d034691da 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-exhaustive.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- qdoctests-outputfromqdocfiles.qdoc -->
+ <meta name="description" content="This page is a dumping ground for QDoc commands under test.">
<title>Exhaustive testing of QDoc commands | OutputFromQDocFiles</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html
index 8db2de22c..4b50d9ee2 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput-linking.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- qdoctests-outputfromqdocfiles.qdoc -->
+ <meta name="description" content="This is a page for testing QDoc's link command.">
<title>Testing QDoc's link command | OutputFromQDocFiles</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html
index 3a3c2a095..f9fa82782 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/tocbreadcrumbs/qdoctests-qdocfileoutput.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- qdoctests-outputfromqdocfiles.qdoc -->
+ <meta name="description" content="This is a simple page for testing purposes only.">
<title>Testing QDoc output from .qdoc files | OutputFromQDocFiles</title>
</head>
<body>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
index 3e75ad12d..eae6fc6fb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<!-- examples.qdoc -->
+ <meta name="description" content="Basic set of UI components.">
<title>UI Components | Test</title>
</head>
<body>