qdoc: Fixed type linking for QML properties (most of them).

Task-number: QTBUG-6340

3 files changed, 8 insertions, 4 deletions

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index e1916b4..49ba5f6 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE
 
 #define COMMAND_VERSION                 Doc::alias("version")
 int HtmlGenerator::id = 0;
+bool HtmlGenerator::debugging_on = false;
 
 QString HtmlGenerator::sinceTitles[] =
     {
@@ -2703,6 +2704,7 @@ void HtmlGenerator::generateQmlItem(const Node *node,
         marked.replace("</@type>", "");
     }
     out() << highlightedCode(marked, marker, relative);
+    debugging_on = false;
 }
 #endif
 
@@ -3097,9 +3099,8 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
             for (int k = 0; k != 3; ++k) {
                 if (parseArg(src, typeTags[k], &i, n, &arg, &par1)) {
                     par1 = QStringRef();
-                    QString link = linkForNode(
-                            marker->resolveTarget(arg.toString(), myTree, relative),
-                            relative);
+                    const Node* n = marker->resolveTarget(arg.toString(), myTree, relative);
+                    QString link = linkForNode(n,relative);
                     addLink(link, arg, &html);
                     handled = true;
                     break;
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index e060257..aad5021 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -341,6 +341,8 @@ class HtmlGenerator : public PageGenerator
     NewClassMaps newClassMaps;
     NewClassMaps newQmlClassMaps;
     static int id;
+ public:
+    static bool debugging_on;
 };
 
 #define HTMLGENERATOR_ADDRESS           "address"
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index d31de4d..d3de46c 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -171,7 +171,8 @@ const Node *Tree::findNode(const QStringList &path,
         if (node && i == path.size()
                 && (!(findFlags & NonFunction) || node->type() != Node::Function
                     || ((FunctionNode *)node)->metaness() == FunctionNode::MacroWithoutParams))
-            return node;
+            if (node->subType() != Node::QmlPropertyGroup)
+                return node;
         relative = relative->parent();
     } while (relative);