AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Documentation for property groups is back

Browse Source 
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>
This commit is contained in:
Martin Smith 2013-09-17 13:12:09 +02:00 committed by The Qt Project
parent aed9a8d49b
commit d84ed9a92a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/qdoc/cppcodeparser.cpp
View File

@ -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;