qdoc: Fix CMake statement

find_package() only knows about COMPONENTS, not COMPONENT.

While at it, also make the find_package call REQUIRED, and do use
the versioned library target name.

Pick-to: dev 6.0
Change-Id: I1410b7c8cce84a1f24853bfcef650e440c468b33
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

21 files changed, 51 insertions, 51 deletions

diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
index d8eb35141..c0038b64e 100644
--- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -3338,7 +3338,7 @@
         <p>A namespace. <a href="#details">More...</a></p>
         <div class="table"><table class="alignedsummary">
         <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Bar&gt;</span>
-        </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT Baz)</td></tr>
+        </td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS Baz REQUIRED)</td></tr>
     \endraw
 
 
diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/docbookgenerator.cpp
index 2072b97a3..7e7b4d070 100644
--- a/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/docbookgenerator.cpp
@@ -1790,11 +1790,11 @@ void DocBookGenerator::generateRequisites(const Aggregate *aggregate)
             const CollectionNode *cn =
                     m_qdb->getCollectionNode(aggregate->physicalModuleName(), Node::Module);
             if (cn && !cn->qtCMakeComponent().isEmpty()) {
-                auto qtMajorVersion = QString::number(QT_VERSION_MAJOR);
-                const QString findpackageText = "find_package(Qt" + qtMajorVersion + " COMPONENT "
-                        + cn->qtCMakeComponent() + ")";
-                const QString targetLinkLibrariesText =
-                        "target_link_libraries(mytarget PUBLIC Qt::" + cn->qtCMakeComponent() + ")";
+                const QString qtComponent = "Qt" + QString::number(QT_VERSION_MAJOR);
+                const QString findpackageText = "find_package(" + qtComponent + " COMPONENTS "
+                        + cn->qtCMakeComponent() + " REQUIRED)";
+                const QString targetLinkLibrariesText = "target_link_libraries(mytarget PUBLIC "
+                        + qtComponent + "::" + cn->qtCMakeComponent() + ")";
                 const QStringList cmakeInfo { findpackageText, targetLinkLibrariesText };
                 generateCMakeRequisite(cmakeInfo);
             }
@@ -2841,11 +2841,11 @@ void DocBookGenerator::generateDocBookSynopsis(const Node *node)
                 const CollectionNode *cn =
                         m_qdb->getCollectionNode(aggregate->physicalModuleName(), Node::Module);
                 if (cn && !cn->qtCMakeComponent().isEmpty()) {
-                    const auto qtMajorVersion = QString::number(QT_VERSION_MAJOR);
-                    const QString findpackageText = "find_package(Qt" + qtMajorVersion
-                            + " COMPONENT " + cn->qtCMakeComponent() + ")";
+                    const QString qtComponent = "Qt" + QString::number(QT_VERSION_MAJOR);
+                    const QString findpackageText = "find_package(" + qtComponent
+                            + " COMPONENTS " + cn->qtCMakeComponent() + " REQUIRED)";
                     const QString targetLinkLibrariesText =
-                            "target_link_libraries(mytarget PUBLIC Qt::" + cn->qtCMakeComponent()
+                            "target_link_libraries(mytarget PUBLIC " + qtComponent + "::" + cn->qtCMakeComponent()
                             + ")";
                     generateSynopsisInfo("cmake-find-package", findpackageText);
                     generateSynopsisInfo("cmake-target-link-libraries", targetLinkLibrariesText);
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 58ffccc23..d486749e3 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -1962,11 +1962,11 @@ void HtmlGenerator::addCMakeInfoToMap(const Aggregate *aggregate, QMap<QString,
                 m_qdb->getCollectionNode(aggregate->physicalModuleName(), Node::Module);
         if (cn && !cn->qtCMakeComponent().isEmpty()) {
             text->clear();
-            const auto qtMajorVersion = QString::number(QT_VERSION_MAJOR);
-            const QString findPackageText = "find_package(Qt" + qtMajorVersion + " COMPONENT "
-                    + cn->qtCMakeComponent() + ")";
-            const QString targetLinkLibrariesText =
-                    "target_link_libraries(mytarget PUBLIC Qt::" + cn->qtCMakeComponent() + ")";
+            const QString qtComponent = "Qt" + QString::number(QT_VERSION_MAJOR);
+            const QString findPackageText = "find_package(" + qtComponent + " COMPONENTS "
+                    + cn->qtCMakeComponent() + " REQUIRED)";
+            const QString targetLinkLibrariesText = "target_link_libraries(mytarget PUBLIC "
+                    + qtComponent + "::" + cn->qtCMakeComponent() + ")";
             const Atom lineBreak = Atom(Atom::RawString, " <br/>\n");
             *text << findPackageText << lineBreak << targetLinkLibrariesText;
             requisites.insert(CMakeInfo, *text);
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml
index 50116fae7..51bbbf76a 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-test.xml
@@ -19,8 +19,8 @@
 <db:varlistentry>
 <db:term>CMake</db:term>
 <db:listitem>
-<db:para>find_package(Qt6 COMPONENT QDocTest)</db:para>
-<db:para>target_link_libraries(mytarget PUBLIC Qt::QDocTest)</db:para>
+<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para>
+<db:para>target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</db:para>
 </db:listitem>
 </db:varlistentry>
 <db:varlistentry>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml
index ca439c38d..008386964 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc-testderived.xml
@@ -19,8 +19,8 @@
 <db:varlistentry>
 <db:term>CMake</db:term>
 <db:listitem>
-<db:para>find_package(Qt6 COMPONENT QDocTest)</db:para>
-<db:para>target_link_libraries(mytarget PUBLIC Qt::QDocTest)</db:para>
+<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para>
+<db:para>target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</db:para>
 </db:listitem>
 </db:varlistentry>
 <db:varlistentry>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml
index 2bd666c06..573c700b0 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/testqdoc.xml
@@ -18,8 +18,8 @@
 <db:varlistentry>
 <db:term>CMake</db:term>
 <db:listitem>
-<db:para>find_package(Qt6 COMPONENT QDocTest)</db:para>
-<db:para>target_link_libraries(mytarget PUBLIC Qt::QDocTest)</db:para>
+<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para>
+<db:para>target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</db:para>
 </db:listitem>
 </db:varlistentry>
 <db:varlistentry>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
index 68124a7bd..407747bf2 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html
@@ -21,8 +21,8 @@
 <!-- @@@SeenClass -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;SeenClass&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="details"></a>
 <!-- $$$SeenClass-description -->
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 59d471cad..f00e7dd68 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html
@@ -27,8 +27,8 @@
 <!-- @@@Test -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Test&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
 </td></tr></table></div><ul>
 <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li>
 <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
index b57a6b794..6836a93b1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html
@@ -23,8 +23,8 @@
 <!-- @@@TestQDoc -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;TestCPP&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="classes"></a>
 <h2 id="classes">Classes</h2>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml b/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml
index 44d167b59..e1a6e40a4 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml
@@ -19,8 +19,8 @@
 <db:varlistentry>
 <db:term>CMake</db:term>
 <db:listitem>
-<db:para>find_package(Qt6 COMPONENT QDocTest)</db:para>
-<db:para>target_link_libraries(mytarget PUBLIC Qt::QDocTest)</db:para>
+<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para>
+<db:para>target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</db:para>
 </db:listitem>
 </db:varlistentry>
 <db:varlistentry>
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 d083c6d9e..862d0f28e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/properties/testqdoc-testderived.html
@@ -28,8 +28,8 @@
 <!-- @@@TestDerived -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;TestDerived&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul>
 <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li>
 </ul>
 <a name="public-types"></a>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml
index 87974c004..872dfb06e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum-docbook/testqdoc-test.xml
@@ -19,8 +19,8 @@
 <db:varlistentry>
 <db:term>CMake</db:term>
 <db:listitem>
-<db:para>find_package(Qt6 COMPONENT QDocTest)</db:para>
-<db:para>target_link_libraries(mytarget PUBLIC Qt::QDocTest)</db:para>
+<db:para>find_package(Qt6 COMPONENTS QDocTest REQUIRED)</db:para>
+<db:para>target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</db:para>
 </db:listitem>
 </db:varlistentry>
 <db:varlistentry>
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 5ca38ca20..a4bf985a7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html
@@ -27,8 +27,8 @@
 <!-- @@@Test -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Test&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
 </td></tr></table></div><ul>
 <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li>
 <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
index 8ed714702..c83379424 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html
@@ -22,8 +22,8 @@
 <!-- @@@Bar -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Bar&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="details"></a>
 <!-- $$$Bar-description -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
index 12e24271a..eb37d6cf9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html
@@ -22,8 +22,8 @@
 <!-- @@@Baz -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Baz&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="details"></a>
 <!-- $$$Baz-description -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
index b5841de79..7f1bb17fb 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html
@@ -22,8 +22,8 @@
 <!-- @@@Foo -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Foo&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="details"></a>
 <!-- $$$Foo-description -->
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 33226f5ff..9e7d89b81 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html
@@ -27,8 +27,8 @@
 <!-- @@@Test -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Test&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
 </td></tr></table></div><ul>
 <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li>
 <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li>
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 a186ce24a..6563e5bc7 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-vec.html
@@ -22,8 +22,8 @@
 <!-- @@@Vec -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Vec&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="details"></a>
 <!-- $$$Vec-description -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
index 8ff9001b5..355f18d3f 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html
@@ -27,8 +27,8 @@
 <!-- @@@Test -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;Test&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p>
 </td></tr></table></div><ul>
 <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li>
 <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
index f820ce49f..465800878 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html
@@ -24,8 +24,8 @@
 <!-- @@@TestDerived -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;TestDerived&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul>
 <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li>
 </ul>
 <a name="public-types"></a>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
index b57a6b794..6836a93b1 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html
@@ -23,8 +23,8 @@
 <!-- @@@TestQDoc -->
 <div class="table"><table class="alignedsummary">
 <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include &lt;TestCPP&gt;</span>
-</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENT QDocTest) <br/>
-target_link_libraries(mytarget PUBLIC Qt::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
+</td></tr><tr><td class="memItemLeft rightAlign topAlign"> CMake:</td><td class="memItemRight bottomAlign"> find_package(Qt6 COMPONENTS QDocTest REQUIRED) <br/>
+target_link_libraries(mytarget PUBLIC Qt6::QDocTest)</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul>
 </ul>
 <a name="classes"></a>
 <h2 id="classes">Classes</h2>