summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2021-05-19 20:00:55 +0200
committerPaul Wicking <paul.wicking@qt.io>2021-05-20 17:32:38 +0200
commitd1676ef4ef3e90ef23ab9a319b71cc3f2731a1c7 (patch)
treed9a771b00c2a7ead1914b0b658029dbec87938a5 /tests
parentdeb2e55ee1f9c3649c83886015d80c846f113e9c (diff)
downloadqttools-d1676ef4ef3e90ef23ab9a319b71cc3f2731a1c7.tar.gz
QDoc: Improve Text::operator<<()
Add a check to Text::operator<<() to stops QDoc from outputting unnecessary "empty" spans, i.e. <span class="subtitle"></span> when generating html. Task-number: QTBUG-81209 Task-number: QTBUG-73026 Change-Id: I4df7875ee1c29bc1d48e9c3e53e8ce0518f3be3e Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/autolinking.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.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/index-linking.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/index.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/obsolete-classes.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.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.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/qmlmodules.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/scoped-enum-linking.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.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/toc.html1
-rw-r--r--tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html1
35 files changed, 0 insertions, 35 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html b/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html
index 5d37f2a99..b86a94d61 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/autolinking.html
@@ -15,7 +15,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Autolinking</h1>
-<span class="subtitle"></span>
<!-- $$$autolinking.html-description -->
<div class="descr" id="details">
<h2 id="testqdoc">TestQDoc</h2>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html
index 115e8e6de..423ef6b42 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Classes</h1>
-<span class="subtitle"></span>
<!-- $$$classes.html-description -->
<div class="descr" id="details">
<div class="table"><table class="annotated">
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html
index 53262b832..fd53f896e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Headers</h1>
-<span class="subtitle"></span>
<!-- $$$headers-description -->
<div class="descr" id="details">
</div>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html
index ce11f9406..33e984136 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html
@@ -7,7 +7,6 @@
</head>
<body>
<h1 class="title">doc index</h1>
-<span class="subtitle"></span>
<!-- $$$index.html-description -->
<div class="descr" id="details">
<h2 id="c-classes">C++ Classes</h2>
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 ac737c7ce..dda065dff 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
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">AbstractParent QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$AbstractParent-brief -->
<p>Abstract base QML type. <a href="#details">More...</a></p>
<!-- @@@AbstractParent -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html
index 4dc94092c..600d6d4e6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/index-linking.html
@@ -15,7 +15,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Linking</h1>
-<span class="subtitle"></span>
<!-- $$$index-linking.html-description -->
<div class="descr" id="details">
<h2 id="qml-properties">QML properties</h2>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html
index 49a0d8c37..defe95c26 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/index.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html
@@ -7,7 +7,6 @@
</head>
<body>
<h1 class="title">doc index</h1>
-<span class="subtitle"></span>
<!-- $$$index.html-description -->
<div class="descr" id="details">
<div class="table"><table class="annotated">
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 224e9e1bc..c17042c75 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QDoc Test C++ Classes</h1>
-<span class="subtitle"></span>
<!-- $$$TestCPP-brief -->
<p>A test module page. <a href="#details">More...</a></p>
<!-- @@@TestCPP -->
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 4a2734fc2..8ae6022c0 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
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QDoc.Test QML Module</h1>
-<span class="subtitle"></span>
<p><b>This module is under development and is subject to change.</b></p>
<p>This module was introduced in Qt 1.1.</p>
<!-- $$$QDoc.Test-description -->
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 64b3ea34d..2d77b7bf1 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
@@ -18,7 +18,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QML Documentation Example</h1>
-<span class="subtitle"></span>
<!-- $$$componentset-brief -->
<p>Example for documenting QML types.</p>
<!-- @@@componentset -->
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 f3597ba7a..fd5beda6d 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html
@@ -15,7 +15,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QDoc Test C++ Classes</h1>
-<span class="subtitle"></span>
<!-- $$$TestCPP-brief -->
<p>A test module page. <a href="#details">More...</a></p>
<!-- @@@TestCPP -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html b/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html
index d52c11f7c..19edb918c 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/obsolete-classes.html
@@ -16,7 +16,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Obsolete Classes</h1>
-<span class="subtitle"></span>
<!-- $$$obsolete-classes.html-description -->
<div class="descr" id="details">
<h2 id="classes-with-obsolete-members">Classes with obsolete members</h2>
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 0605e4d60..93f512497 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QDoc.Test QML Module</h1>
-<span class="subtitle"></span>
<p><b>This module is under development and is subject to change.</b></p>
<p>This module was introduced in Qt 1.1.</p>
<!-- $$$QDoc.Test-description -->
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 bf35aa471..508c12398 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-exhaustive.html
@@ -19,7 +19,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Exhaustive testing of QDoc commands</h1>
-<span class="subtitle"></span>
<!-- $$$qdoctests-qdocfileoutput-exhaustive.html-description -->
<div class="descr" id="details">
<h2 id="this-is-a-section1">This is a section1</h2>
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 9e905a9d2..4d446c159 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html
@@ -22,7 +22,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Testing QDoc's link command</h1>
-<span class="subtitle"></span>
<!-- $$$qdoctests-qdocfileoutput-linking.html-description -->
<div class="descr" id="details">
<span id="link-test-target"></span><h2 id="link-targets">Link targets</h2>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
index 7f320ae2c..94f0c9a1f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html
@@ -22,7 +22,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Testing QDoc output from .qdoc files</h1>
-<span class="subtitle"></span>
<!-- $$$qdoctests-qdocfileoutput.html-description -->
<div class="descr" id="details">
<p>QDoc generates documentation for software projects. It does this by extracting <i>QDoc comments</i> from project source files. QDoc comments are signified by a C-style-like comment tag followed by an exclamation point, like this: <code>/*!</code> <code>This text is contained within QDoc comment tags.</code> <code>*/</code>.</p>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
index 180e4f2c9..66f3d66ee 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html
@@ -16,7 +16,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">int QML Basic Type</h1>
-<span class="subtitle"></span>
<h2 id="methods">Methods</h2>
<ul>
<li class="fn">int <b><b><a href="qml-int.html#abs-method">abs</a></b></b>()</li>
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 ea33bc346..873f38694 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
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">AbstractParent QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$AbstractParent-brief -->
<p>Abstract base QML type. <a href="#details">More...</a></p>
<!-- @@@AbstractParent -->
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 fd46d7319..4cdebba6b 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
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Child QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$Child-brief -->
<p>A Child inheriting its parent. <a href="#details">More...</a></p>
<!-- @@@Child -->
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 d98ee341a..79e3bd909 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
@@ -19,7 +19,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">DocTest QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$DocTest-brief -->
<p>Represents a doc test case. <a href="#details">More...</a></p>
<!-- @@@DocTest -->
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 288eedb51..57c0f0da0 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
@@ -20,7 +20,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Type QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$Type-brief -->
<p>A QML type documented in a .cpp file. <a href="#details">More...</a></p>
<!-- @@@Type -->
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 59b57b192..b0e12e1b8 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
@@ -16,7 +16,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">YetAnotherChild QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$YetAnotherChild-brief -->
<p>A type inheriting from internal abstract parent. <a href="#details">More...</a></p>
<!-- @@@YetAnotherChild -->
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 2bfdd1ebb..2382d6a32 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
@@ -15,7 +15,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">TypeNoVersion QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$TypeNoVersion-brief -->
<p>Another QML type documented in a .cpp file. <a href="#details">More...</a></p>
<!-- @@@TypeNoVersion -->
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 112c7d74a..f6db51dc1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html
@@ -16,7 +16,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">ProgressBar QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$ProgressBar-brief -->
<p>A component that shows the progress of an event. <a href="#details">More...</a></p>
<!-- @@@ProgressBar -->
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 e16a1be71..18271cf77 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Switch QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$Switch-brief -->
<p>A component that can be turned on or off. <a href="#details">More...</a></p>
<!-- @@@Switch -->
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 8d8b4d673..170bfa320 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">TabWidget QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$TabWidget-brief -->
<p>A widget that places its children as tabs. <a href="#details">More...</a></p>
<!-- @@@TabWidget -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html
index 68860f9d8..c45ae07e9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlmodules.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QML Modules</h1>
-<span class="subtitle"></span>
<!-- $$$qmlmodules.html-description -->
<div class="descr" id="details">
<div class="table"><table class="annotated">
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 bf8a189be..1d466cf6e 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
@@ -16,7 +16,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Parent QML Type</h1>
-<span class="subtitle"></span>
<!-- $$$Parent-brief -->
<p>Base QML type. <a href="#details">More...</a></p>
<!-- @@@Parent -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html
index cce846af3..a663df7ab 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/scoped-enum-linking.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Enum Linking</h1>
-<span class="subtitle"></span>
<!-- $$$scoped-enum-linking.html-description -->
<div class="descr" id="details">
<p>Linking to <a href="testqdoc-test.html#ScopedEnum-enum">All</a>.</p>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html
index 3952b813d..e46acb6e5 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">CMake Example Project</h1>
-<span class="subtitle"></span>
<!-- $$$cmaketest-description -->
<div class="descr" id="details">
<p class="centerAlign"><img src="images/leonardo-da-vinci.png" alt="" /></p><p>Files:</p>
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 b8ed24a06..b89ce8ccb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
@@ -18,7 +18,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QML Documentation Example</h1>
-<span class="subtitle"></span>
<!-- $$$componentset-brief -->
<p>Example for documenting QML types.</p>
<!-- @@@componentset -->
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 fdaa8dc95..0bb01efdf 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test-nover-qmlmodule.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Versionless QML Module</h1>
-<span class="subtitle"></span>
<p>This module was introduced in Qt 1.1.</p>
<!-- $$$Test.NoVer-description -->
<div class="descr" id="details">
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
index cbfb33661..f4e3d79e6 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html
@@ -17,7 +17,6 @@
</div>
<div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">QDoc Test C++ Classes</h1>
-<span class="subtitle"></span>
<!-- $$$TestCPP-brief -->
<p>A test module page. <a href="#details">More...</a></p>
<!-- @@@TestCPP -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/toc.html b/tests/auto/qdoc/generatedoutput/expected_output/toc.html
index dd9c81d19..dafd47fd8 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/toc.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/toc.html
@@ -13,7 +13,6 @@
</p><p/>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">Table of Contents</h1>
-<span class="subtitle"></span>
<!-- $$$toc.html-description -->
<div class="descr" id="details">
<ul>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
index 47dcf747d..537bfab91 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html
@@ -8,7 +8,6 @@
<body>
<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div>
<h1 class="title">UI Components</h1>
-<span class="subtitle"></span>
<!-- $$$UIComponents-description -->
<div class="descr" id="details">
<p>This is a listing of a list of UI components implemented by QML types. These files are available for general import and they are based on the Qt Quick Code Samples.</p>