qdoc: List obsolete QML members in obsolete QML members filev5.13.0-beta4

qdoc was building the obsolete QML members files incorrectly. It was listing
the active members when it should have been listing the obsolete members.
This update fixes that bug.

Task-number: QTBUG-75785
Change-Id: I37a5469cd51c5b15bf3edac9e8bd98c2894bef1e
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

2 files changed, 9 insertions, 9 deletions

diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index e9711851a..a1e9da6bf 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -1730,7 +1730,7 @@ void HtmlGenerator::generateQmlTypePage(QmlTypeNode* qcn, CodeMarker* marker)
             out() << "<a name=\"" << ref
                   << "\"></a>" << divNavTop << '\n';
             out() << "<h2 id=\"" << ref << "\">" << protectEnc(s->title()) << "</h2>\n";
-            generateQmlSummary(*s, qcn, marker);
+            generateQmlSummary(s->members(), qcn, marker);
         }
         ++s;
     }
@@ -1796,7 +1796,7 @@ void HtmlGenerator::generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker*
             out() << "<a name=\"" << ref
                   << "\"></a>" << divNavTop << '\n';
             out() << "<h2 id=\"" << ref << "\">" << protectEnc(s->title()) << "</h2>\n";
-            generateQmlSummary(*s, qbtn, marker);
+            generateQmlSummary(s->members(), qbtn, marker);
         }
         ++s;
     }
@@ -2867,7 +2867,7 @@ QString HtmlGenerator::generateObsoleteQmlMembersFile(const Sections &sections,
         out() << "<a name=\"" << ref
               << "\"></a>" << divNavTop << '\n';
         out() << "<h2 id=\"" << ref << "\">" << protectEnc(summary_spv.at(i)->title()) << "</h2>\n";
-        generateQmlSummary(*(summary_spv.at(i)), aggregate, marker);
+        generateQmlSummary(summary_spv.at(i)->obsoleteMembers(), aggregate, marker);
     }
 
     for (int i = 0; i < details_spv.size(); ++i) {
@@ -4244,17 +4244,17 @@ void HtmlGenerator::endLink()
 }
 
 /*!
-  Generates the summary for the \a section. Only used for
+  Generates the summary list for the \a members. Only used for
   sections of QML element documentation.
  */
-void HtmlGenerator::generateQmlSummary(const Section& section,
+void HtmlGenerator::generateQmlSummary(const NodeVector &members,
                                        const Node *relative,
                                        CodeMarker *marker)
 {
-    if (!section.members().isEmpty()) {
+    if (!members.isEmpty()) {
         out() << "<ul>\n";
-        NodeVector::const_iterator m = section.members().constBegin();
-        while (m != section.members().constEnd()) {
+        NodeVector::const_iterator m = members.constBegin();
+        while (m != members.constEnd()) {
             out() << "<li class=\"fn\">";
             generateQmlItem(*m, relative, marker, true);
             if ((*m)->isPropertyGroup()) {
diff --git a/src/qdoc/htmlgenerator.h b/src/qdoc/htmlgenerator.h
index 3dba71a56..0c897483b 100644
--- a/src/qdoc/htmlgenerator.h
+++ b/src/qdoc/htmlgenerator.h
@@ -153,7 +153,7 @@ private:
                              const Node *relative,
                              CodeMarker *marker,
                              Section::Status = Section::Active);
-    void generateQmlSummary(const Section& section,
+    void generateQmlSummary(const NodeVector &members,
                             const Node *relative,
                             CodeMarker *marker);
     void generateQmlItem(const Node *node,