diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:33:48 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 10:52:23 +0200 |
commit | 4617216e6f5952c34e93f3d803034276b5dfdc8e (patch) | |
tree | 1414088244874ef5dadc5bedc863160037efb141 /src/qdoc/htmlgenerator.cpp | |
parent | 18f9ac9e9489e48ea756bd89f6f40dd4499c42a3 (diff) | |
parent | 9603be3007cd24b1e7944be46d32e6a9ab6f8b1e (diff) | |
download | qttools-4617216e6f5952c34e93f3d803034276b5dfdc8e.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/qdoc/htmlgenerator.cpp')
-rw-r--r-- | src/qdoc/htmlgenerator.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index bd66d387f..f22a9d130 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -46,6 +46,7 @@ #include <qtextcodec.h> #include <quuid.h> #include <qmap.h> +#include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE @@ -2106,8 +2107,6 @@ void HtmlGenerator::generateHeader(const QString& title, if (node && !node->doc().location().isEmpty()) out() << "<!-- " << node->doc().location().fileName() << " -->\n"; - QString projectVersion = qdb_->version(); - //determine the rest of the <title> element content: "title | titleSuffix version" QString titleSuffix; if (!landingtitle.isEmpty()) { @@ -2129,15 +2128,9 @@ void HtmlGenerator::generateHeader(const QString& title, //default: "title | Qt version" titleSuffix = QLatin1String("Qt "); - //for pages that duplicate the title and suffix (landing pages, home pages, - // and module landing pages, clear the duplicate if (title == titleSuffix) titleSuffix.clear(); - //for pages that duplicate the version, clear the duplicate - if (title.contains(projectVersion) || titleSuffix.contains(projectVersion)) - projectVersion.clear(); - QString divider; if (!titleSuffix.isEmpty() && !title.isEmpty()) divider = QLatin1String(" | "); @@ -2148,9 +2141,18 @@ void HtmlGenerator::generateHeader(const QString& title, << divider << titleSuffix; - if (!projectVersion.isEmpty()) - out() << QLatin1Char(' ') << projectVersion; - + // append a full version to the suffix if neither suffix nor title + // include (a prefix of) version information + QVersionNumber projectVersion = QVersionNumber::fromString(qdb_->version()); + if (!projectVersion.isNull()) { + QVersionNumber titleVersion; + QRegExp re("\\d+\\.\\d+"); + const QString &versionedTitle = titleSuffix.isEmpty() ? title : titleSuffix; + if (versionedTitle.contains(re)) + titleVersion = QVersionNumber::fromString(re.cap()); + if (titleVersion.isNull() || !titleVersion.isPrefixOf(projectVersion)) + out() << QLatin1Char(' ') << projectVersion.toString(); + } out() << "</title>\n"; // Include style sheet and script links. |