diff options
author | Martin Smith <msmith@trolltech.com> | 2009-10-29 13:50:51 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2009-10-29 13:50:51 (GMT) |
commit | 5e4035ede6505f638f4741dcebbf19e485a1b993 (patch) | |
tree | 2ae87d72334b0b0168e22cbf141a40185a027d4c /tools/qdoc3/htmlgenerator.cpp | |
parent | 8bbf1907613d88e38630ec0343bb9f0d1fb6c5d0 (diff) | |
download | Qt-5e4035ede6505f638f4741dcebbf19e485a1b993.zip Qt-5e4035ede6505f638f4741dcebbf19e485a1b993.tar.gz Qt-5e4035ede6505f638f4741dcebbf19e485a1b993.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.cpp | 11 |
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(); |