diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-30 10:33:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-30 10:33:27 +0200 |
| commit | 310ac6b0584875303ec5eab603b60320277ff598 (patch) | |
| tree | 963c4378f1c277c8b0a438596c4b99453dbaf568 /src/qdoc/main.cpp | |
| parent | 38e5f27de587e6c9cc3b2844af792289afcd2d07 (diff) | |
| parent | fd797fc9441261d0679d60b0af3682966c862875 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/androiddeployqt/main.cpp
Change-Id: I3df907e197b1b976f74562f1a9cce10261f166f3
Diffstat (limited to 'src/qdoc/main.cpp')
| -rw-r--r-- | src/qdoc/main.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index f13412333..d8798b7cd 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -376,10 +376,14 @@ static void processQdocconfFile(const QString &fileName) // Store the title of the index (landing) page NamespaceNode* root = qdb->primaryTreeRoot(); - if (root) + if (root) { + QString title = config.getString(CONFIG_NAVIGATION + + Config::dot + + CONFIG_LANDINGPAGE); root->tree()->setIndexTitle(config.getString(CONFIG_NAVIGATION - + Config::dot - + CONFIG_LANDINGPAGE)); + + Config::dot + + CONFIG_LANDINGTITLE, title)); + } QSet<QString> excludedDirs = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEDIRS)); QSet<QString> excludedFiles = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEFILES)); |