summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Edmundson <davidedmundson@kde.org>2014-08-12 19:48:30 +0200
committerDavid Edmundson <davidedmundson@kde.org>2014-08-13 09:22:30 +0200
commit7487592cceaf3d2cfe002257e1d7f0b023c0ec8a (patch)
tree7d5b736b29621202d5b6575c5805f6d57bff538d
parentc0556d92f3415b478da4aff24f6f5545df394983 (diff)
Create.tag entries for QML classes
This patch makes Qml Classes get written to tag files the same as C++ tags. Task-number: QTBUG-40551 Change-Id: I4a1973eeed6f7c2fdb65686c50e6ae4d273c9d7a Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org> Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--src/tools/qdoc/node.cpp3
-rw-r--r--src/tools/qdoc/qdoctagfiles.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index f16c35c3a9..87a055ae0f 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -2572,6 +2572,9 @@ QString Node::fullDocumentName() const
// Create a name based on the type of the ancestor node.
QString concatenator = "::";
+ if (n->isQmlType())
+ concatenator = QLatin1Char('.');
+
if (n->isDocNode())
concatenator = QLatin1Char('#');
diff --git a/src/tools/qdoc/qdoctagfiles.cpp b/src/tools/qdoc/qdoctagfiles.cpp
index cc2bd3f1f0..4809227413 100644
--- a/src/tools/qdoc/qdoctagfiles.cpp
+++ b/src/tools/qdoc/qdoctagfiles.cpp
@@ -120,6 +120,7 @@ void QDocTagFiles::generateTagFileCompounds(QXmlStreamWriter& writer, const Inne
kind = "namespace";
break;
case Node::Class:
+ case Node::QmlType:
kind = "class";
break;
case Node::Enum: