diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-27 15:50:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-27 15:50:45 (GMT) |
| commit | ef629c2dc4fb42446e89c1b6fbe4160d8a5e6c9f (patch) | |
| tree | da25b5dd0d5f793c9b67686ccba319ccefa3ac25 | |
| parent | 339e3804abf1dbeac9fe89699c2dc4ebc94d5cdd (diff) | |
| parent | 4a100d27cca824114c9bfa5e88096835fadd8a27 (diff) | |
| download | Qt-ef629c2dc4fb42446e89c1b6fbe4160d8a5e6c9f.zip Qt-ef629c2dc4fb42446e89c1b6fbe4160d8a5e6c9f.tar.gz Qt-ef629c2dc4fb42446e89c1b6fbe4160d8a5e6c9f.tar.bz2 | |
Merge branch 'qdoc-simplified' into 4.7
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 2 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 1dca28c..3bb69da 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -52,7 +52,7 @@ An \c import statement includes the module name, and possibly a version number. This can be seen in the snippet commonly found at the top of QML files: \qml - import QtQuick 1.0 +import QtQuick 1.0 \endqml This imports version 1.0 of the "QtQuick" module into the global namespace. (The QML diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 768be46..196bd44 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1642,12 +1642,10 @@ void HtmlGenerator::generateHeader(const QString& title, QString shortVersion = myTree->version(); if (shortVersion.count(QChar('.')) == 2) shortVersion.truncate(shortVersion.lastIndexOf(QChar('.'))); - if (!shortVersion.isEmpty()) { - if (project == "QSA") - shortVersion = "QSA " + shortVersion + ": "; - else - shortVersion = "Qt " + shortVersion + ": "; - } + if (!project.isEmpty()) + shortVersion = project + QLatin1String(" ") + shortVersion + QLatin1String(": "); + else + shortVersion = QLatin1String("Qt ") + shortVersion + QLatin1String(": "); // Generating page title out() << " <title>" << shortVersion << protectEnc(title) << "</title>\n"; |