diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-07-08 12:56:09 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-07-08 12:56:09 (GMT) |
| commit | ed8822c844921ce04bb8c6179acb9c59bb62afdc (patch) | |
| tree | e9e228b494fd3250baab9b4caf2d19360e9251db | |
| parent | 0b8a7842975b195a17b3add4c98f64baeaedcf8c (diff) | |
| parent | 5537ad76ccd29b58705d01056cc56a332bdf0eda (diff) | |
| download | Qt-ed8822c844921ce04bb8c6179acb9c59bb62afdc.zip Qt-ed8822c844921ce04bb8c6179acb9c59bb62afdc.tar.gz Qt-ed8822c844921ce04bb8c6179acb9c59bb62afdc.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/node.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 8c7d5ad..c1e01d7 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2949,7 +2949,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode, static const QString headerTag("headerfile"); static const QString funcTag("func"); static const QString linkTag("link"); - + // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)" bool done = false; for (int i = 0, srcSize = src.size(); i < srcSize;) { diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index b077074..da62e29 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -299,7 +299,7 @@ InnerNode::~InnerNode() Node *InnerNode::findNode(const QString& name) { Node *node = childMap.value(name); - if (node) + if (node && node->subType() != QmlPropertyGroup) return node; if ((type() == Fake) && (subType() == QmlClass)) { for (int i=0; i<children.size(); ++i) { |