diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 08:45:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 08:45:41 +0200 |
| commit | e66faec4ea11d394652a9cbf02dfe5b407d4c04d (patch) | |
| tree | 88a49c37b178511fbc861d7de1403f1c2a7649bd /sources/shiboken2 | |
| parent | 66a0fa21efb94ac7cc16032213c91a33c0670e2f (diff) | |
| parent | d9359a35ff059cc81c155764f4c234d03655bd45 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I04187b70448808519c92bbb46b09d58e8babc3b3
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp index dd29c02f0..3b6d1c870 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp @@ -349,6 +349,7 @@ QtXmlToSphinx::QtXmlToSphinx(QtDocGenerator* generator, const QString& doc, cons m_handlerMap.insert(QLatin1String("skipto"), &QtXmlToSphinx::handleIgnoredTag); m_handlerMap.insert(QLatin1String("target"), &QtXmlToSphinx::handleTargetTag); m_handlerMap.insert(QLatin1String("page"), &QtXmlToSphinx::handlePageTag); + m_handlerMap.insert(QLatin1String("group"), &QtXmlToSphinx::handlePageTag); // useless tags m_handlerMap.insert(QLatin1String("description"), &QtXmlToSphinx::handleUselessTag); @@ -1230,10 +1231,11 @@ void QtXmlToSphinx::handlePageTag(QXmlStreamReader &reader) m_output << rstLabel(title.toString()); const QStringRef fullTitle = reader.attributes().value(fullTitleAttribute()); - if (!fullTitle.isEmpty()) { - const int size = writeEscapedRstText(m_output, fullTitle); - m_output << endl << Pad('*', size) << endl << endl; - } + const int size = fullTitle.isEmpty() + ? writeEscapedRstText(m_output, title) + : writeEscapedRstText(m_output, fullTitle); + + m_output << endl << Pad('*', size) << endl << endl; const QStringRef brief = reader.attributes().value(briefAttribute()); if (!brief.isEmpty()) @@ -2303,8 +2305,9 @@ void QtDocGenerator::writeAdditionalDocumentation() if (fi.isFile()) { const QString rstFileName = fi.baseName() + rstSuffix; const QString rstFile = targetDir + QLatin1Char('/') + rstFileName; + const QString context = targetDir.mid(targetDir.lastIndexOf(QLatin1Char('/')) + 1); if (QtXmlToSphinx::convertToRst(this, fi.absoluteFilePath(), - rstFile, QString(), &errorMessage)) { + rstFile, context, &errorMessage)) { ++successCount; qCDebug(lcShiboken).nospace().noquote() << __FUNCTION__ << " converted " << fi.fileName() |