From 5903558f17a7a3173ad7a592892262bf297b52f2 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 8 Jul 2010 13:43:57 +0200
Subject: qdoc: Fixed broken QML property links.

Task-number: QTBUG-12038
---
 tools/qdoc3/htmlgenerator.cpp | 2 +-
 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 567a297..5a8fb86 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) {
-- 
cgit v0.12