diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-03-20 13:52:20 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-03-25 10:59:25 +0000 |
| commit | 1341161998d3ed9fe005fc94eda1723b8da02079 (patch) | |
| tree | 5ac17fe35b511475f7655b51bab30debd54ec924 /src/tools/qdoc/tree.cpp | |
| parent | 040e201ba2a17310ff533b25d0ef079deb2e3494 (diff) | |
qdoc: Duplicate QML types in the "All QML Types" list are distinguished
We have two State types in the All QML Types list. One is in QtQuick
and the other is in QtQml, but they are both just listed as "State"
with no way to tell which is which. Now they look like this:
State: QtQml
State: QtQuick
Change-Id: I48bb3deda10a61f565d1aed1910360fea4fb7891
Task-number: QTBUG-45141
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/tree.cpp')
| -rw-r--r-- | src/tools/qdoc/tree.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index d36003c665..d0d0bcbb5a 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -64,12 +64,17 @@ QT_BEGIN_NAMESPACE Constructs a Tree. \a qdb is the pointer to the singleton qdoc database that is constructing the tree. This might not be necessary, and it might be removed later. + + \a camelCaseModuleName is the project name for this tree, + which was obtained from the qdocconf file via the Config + singleton. */ -Tree::Tree(const QString& physicalModuleName, QDocDatabase* qdb) +Tree::Tree(const QString& camelCaseModuleName, QDocDatabase* qdb) : treeHasBeenAnalyzed_(false), docsHaveBeenGenerated_(false), linkCount_(0), - physicalModuleName_(physicalModuleName), + camelCaseModuleName_(camelCaseModuleName), + physicalModuleName_(camelCaseModuleName.toLower()), qdb_(qdb), root_(0, QString()), targetListMap_(0) |