summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-10-29 13:50:51 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-29 22:58:38 (GMT)
commitd6b889fcd8f28e430d6082f0290b00030e30d3ca (patch)
treef2abd481cdf29322c9d66039b925aacdba19de98 /tools/qdoc3/htmlgenerator.cpp
parent2f4675f0a21b82bff7de165619664b7c2b09c585 (diff)
downloadQt-d6b889fcd8f28e430d6082f0290b00030e30d3ca.zip
Qt-d6b889fcd8f28e430d6082f0290b00030e30d3ca.tar.gz
Qt-d6b889fcd8f28e430d6082f0290b00030e30d3ca.tar.bz2
qdoc3: Fixed a linking error for qml properties.
This: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#rotation-prop should now be this: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#transformOrigin-prop)
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 18c7916..eaf4b2e 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -3467,10 +3467,13 @@ QString HtmlGenerator::refForNode(const Node *node)
ref += "-" + QString::number(func->overloadNumber());
}
break;
- case Node::Property:
-#ifdef QDOC_QML
+#ifdef QDOC_QML
+ case Node::Fake:
+ if (node->subType() != Node::QmlPropertyGroup)
+ break;
case Node::QmlProperty:
#endif
+ case Node::Property:
ref = node->name() + "-prop";
break;
#ifdef QDOC_QML
@@ -3512,9 +3515,9 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative)
// ### reintroduce this test, without breaking .dcf files
if (fn != outFileName())
#endif
- link += fn;
+ link += fn;
- if (!node->isInnerNode()) {
+ if (!node->isInnerNode() || node->subType() == Node::QmlPropertyGroup) {
ref = refForNode(node);
if (relative && fn == fileName(relative) && ref == refForNode(relative))
return QString();