summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-10-21 01:50:01 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-21 01:50:01 (GMT)
commitee086ea4fd9baa3df94909dd9f5884578c1eaeb7 (patch)
treea973859d5c54fa1d03434e04e3c959a92b4f37e0 /tools
parent2c70994c3b9b0839ef5d489e6dfcaaf6c4ed6b4d (diff)
downloadQt-ee086ea4fd9baa3df94909dd9f5884578c1eaeb7.zip
Qt-ee086ea4fd9baa3df94909dd9f5884578c1eaeb7.tar.gz
Qt-ee086ea4fd9baa3df94909dd9f5884578c1eaeb7.tar.bz2
Prepend element name for detailed attached property docs.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/cppcodemarker.cpp4
-rw-r--r--tools/qdoc3/node.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 3bee3d9..30ea251 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -353,6 +353,10 @@ QString CppCodeMarker::markedUpQmlItem(const Node* node, bool summary)
QString name = taggedQmlNode(node);
if (summary) {
name = linkTag(node,name);
+ } else if (node->type() == Node::QmlProperty) {
+ const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(node);
+ if (pn->isAttached())
+ name.prepend(pn->element() + QLatin1Char('.'));
}
name = "<@name>" + name + "</@name>";
QString synopsis = name;
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index c6f860f..6b19f60 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -376,7 +376,7 @@ class QmlPropGroupNode : public FakeNode
bool attached);
virtual ~QmlPropGroupNode() { }
- const QString& element() const { return name(); }
+ const QString& element() const { return parent()->name(); }
void setDefault() { isdefault = true; }
bool isDefault() const { return isdefault; }
bool isAttached() const { return att; }
@@ -405,7 +405,7 @@ class QmlPropertyNode : public LeafNode
bool isDesignable() const { return fromTrool(des,false); }
bool isAttached() const { return att; }
- const QString& element() const { return parent()->name(); }
+ const QString& element() const { return static_cast<QmlPropGroupNode*>(parent())->element(); }
private:
enum Trool { Trool_True, Trool_False, Trool_Default };