shiboken6: Refactor handling of the brief class documentation

Move the extraction of the brief text from the
QtDocGenerator to the QtDocParser and store the  brief text
in class Documentation, allowing for later extraction.
The handling for qdoc and doxygen should then be consistent.

Pick-to: 5.15
Change-Id: I86b37ae1c4a92f96508a03f5dbcfb6dc56014382
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
index a88c8554a..4bf1b8455 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
@@ -74,13 +74,14 @@ R"(<typesystem package="Foo">
     docParser.setDocumentationDataDirectory(tempDir.path());
     docParser.fillDocumentation(classA);
 
-    const QString actualDocSimplified = classA->documentation().value().simplified();
+    const Documentation &doc = classA->documentation();
+    const QString actualDocSimplified = doc.value(Documentation::Detailed).simplified();
+    const QString actualBriefSimplified = doc.value(Documentation::Brief).simplified();
     QVERIFY(!actualDocSimplified.isEmpty());
 
 const char expectedDoc[] =
 R"(<?xml version="1.0"?>
 <description>oi
-<brief>Modified Brief</brief>
 <para>Paragraph number 1</para>
 <para>Paragraph number 2</para>
 <para>Some changed contents here</para>
@@ -88,7 +89,7 @@ R"(<?xml version="1.0"?>
 )";
     const QString expectedDocSimplified = QString::fromLatin1(expectedDoc).simplified();
     // Check whether the first modification worked.
-    QVERIFY(actualDocSimplified.contains(QLatin1String("Modified Brief")));
+    QVERIFY(actualBriefSimplified.contains(QLatin1String("Modified Brief")));
 
 #ifndef HAVE_LIBXSLT
     // QtXmlPatterns is unable to handle para[3] in style sheets,