summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/htmlgenerator.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-10-02 12:51:45 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-04 09:40:43 +0200
commitc025d49119a58cf25eed64780b612f9c0629cde5 (patch)
treeacf6d2e14d59115dc0ce865d271e5bbba43178af /src/tools/qdoc/htmlgenerator.cpp
parentc97e369e70c9b17b3ac00f43ccdc191df2183da1 (diff)
qdoc: Eliminate uses of qmlModuleIdentifier()
The QML module identifier is no longer useful. The function to generate it is retained for now. Task-number: QTBUG-32173 Change-Id: Ic811ed432f2059c0370e9e0d86b2e334b5c82a3c Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 835443a6a2..6004f3e398 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1350,8 +1350,8 @@ void HtmlGenerator::generateCollisionPages()
for (int i=0; i<collisions.size(); ++i) {
Node* n = collisions.at(i);
QString t;
- if (!n->qmlModuleIdentifier().isEmpty())
- t = n->qmlModuleIdentifier() + "::";
+ if (!n->qmlModuleName().isEmpty())
+ t = n->qmlModuleName() + "::";
t += protectEnc(fullTitle);
nm.insertMulti(t,n);
}
@@ -1387,8 +1387,8 @@ void HtmlGenerator::generateCollisionPages()
if (p) {
QString link = linkForNode(p,0);
QString label;
- if (!n->qmlModuleIdentifier().isEmpty())
- label = n->qmlModuleIdentifier() + "::";
+ if (!n->qmlModuleName().isEmpty())
+ label = n->qmlModuleName() + "::";
label += n->name() + "::" + p->name();
out() << "<li>";
out() << "<a href=\"" << link << "\">";