summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-05-27 15:00:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-30 09:55:39 +0200
commit8230a0d38dd055387e5c5ed21dbff22cf93f853e (patch)
treebf443be139bc77d1a1cf970c13f2c8dea3d3a840 /src
parent89f219da0c720c326c4c3aa696141e368832ee43 (diff)
qdoc: QML property lists were not shown
For grouped properties, the property list in the summary section was not shown owing to a bug introduced when implementing the abstract base class concept for QML types. This has now been fixed. Task-number: QTBUG-31317 Change-Id: Idc2344539ecf3da53e1be6816f59e01922c5c6fc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/codemarker.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp
index e39ff203a5..c7d9c5b339 100644
--- a/src/tools/qdoc/codemarker.cpp
+++ b/src/tools/qdoc/codemarker.cpp
@@ -397,8 +397,11 @@ void CodeMarker::insert(FastSection &fastSection,
bool irrelevant = false;
bool inheritedMember = false;
if (!node->relates()) {
- if (node->parent() != fastSection.parent_) { // && !node->parent()->isAbstract()) {
- if ((node->parent()->subType() != Node::QmlClass) || !node->parent()->isAbstract()) {
+ InnerNode* p = node->parent();
+ if (p->subType() == Node::QmlPropertyGroup)
+ p = p->parent();
+ if (p != fastSection.parent_) { // && !node->parent()->isAbstract()) {
+ if (p->subType() != Node::QmlClass || !p->isAbstract()) {
//if (node->type() != Node::QmlProperty) {
inheritedMember = true;
}