From d84ed9a92ae0ce96b843c9dd5c263c6a0925405b Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Tue, 17 Sep 2013 13:12:09 +0200
Subject: qdoc: Documentation for property groups is back

This bug was marked fixed and closed, but I'm not sure
it was ever completely fixed. The qdoc commands for QML
property groups were not being processed, so although
the property group and its sub-properties appeared on
the page, the documentation text for the property
group and its properties was never written to the HTML
file. This has been corrected with this update.

Task-number: QTBUG-32341
Change-Id: I5b33ab512a53456379c52236496fb7bc74850842
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
 src/tools/qdoc/cppcodeparser.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index 3e63432047..de9573e99d 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -833,17 +833,15 @@ void CppCodeParser::processQmlProperties(const Doc& doc, NodeList& nodes, DocLis
             if (qmlClass) {
                 qpgn = new QmlPropertyGroupNode(qmlClass, property);
                 qpgn->setLocation(doc.startLocation());
+                nodes.append(qpgn);
+                docs.append(doc);
             }
         }
-        if (topics.size() == 1) {
-            nodes.append(qpgn);
-            docs.append(doc);
-            return;
-        }
     }
     for (int i=0; i<topics.size(); ++i) {
-        if (topics.at(i).topic == COMMAND_QMLPROPERTYGROUP)
-            continue;
+        if (topics.at(i).topic == COMMAND_QMLPROPERTYGROUP) {
+             continue;
+        }
         topic = topics.at(i).topic;
         arg = topics.at(i).args;
         if ((topic == COMMAND_QMLPROPERTY) || (topic == COMMAND_QMLATTACHEDPROPERTY)) {
@@ -2172,7 +2170,6 @@ bool CppCodeParser::matchDocsAndStuff()
                     isQmlPropertyTopic = true;
                 }
             }
-            // if (isQmlPropertyTopic && doc.location().fileName().endsWith("qquickitem.cpp")) {
             NodeList nodes;
             DocList docs;
 
-- 
cgit v1.2.3