diff options
Diffstat (limited to 'src/qdoc/qdocindexfiles.cpp')
-rw-r--r-- | src/qdoc/qdocindexfiles.cpp | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp index 5efd9c175..7302149a3 100644 --- a/src/qdoc/qdocindexfiles.cpp +++ b/src/qdoc/qdocindexfiles.cpp @@ -306,27 +306,6 @@ void QDocIndexFiles::readIndexSection(QXmlStreamReader& reader, else if (!indexUrl.isNull()) location = Location(name); node = qbtn; - } else if (elementName == QLatin1String("qmlpropertygroup")) { - QmlTypeNode* qcn = static_cast<QmlTypeNode*>(parent); - QmlPropertyGroupNode* qpgn = new QmlPropertyGroupNode(qcn, name); - if (attributes.hasAttribute(QLatin1String("location"))) - name = attributes.value("location").toString(); - if (!indexUrl.isEmpty()) - location = Location(indexUrl + QLatin1Char('/') + name); - else if (!indexUrl.isNull()) - location = Location(name); - node = qpgn; - } else if (elementName == QLatin1String("jspropertygroup")) { - QmlTypeNode* qcn = static_cast<QmlTypeNode*>(parent); - QmlPropertyGroupNode* qpgn = new QmlPropertyGroupNode(qcn, name); - qpgn->setGenus(Node::JS); - if (attributes.hasAttribute(QLatin1String("location"))) - name = attributes.value("location").toString(); - if (!indexUrl.isEmpty()) - location = Location(indexUrl + QLatin1Char('/') + name); - else if (!indexUrl.isNull()) - location = Location(name); - node = qpgn; } else if (elementName == QLatin1String("qmlproperty")) { QString type = attributes.value(QLatin1String("type")).toString(); bool attached = false; @@ -886,12 +865,6 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter &writer, Node *node, case Node::JsProperty: nodeName = "jsProperty"; break; - case Node::QmlPropertyGroup: - nodeName = "qmlpropertygroup"; - break; - case Node::JsPropertyGroup: - nodeName = "jspropertygroup"; - break; case Node::Proxy: nodeName = "proxy"; break; @@ -937,12 +910,8 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter &writer, Node *node, href = node->name(); if (node->isQmlNode() || node->isJsNode()) { Aggregate* p = node->parent(); - if (p) { - if (p->isQmlPropertyGroup() || p->isJsPropertyGroup()) - p = p->parent(); - if (p && (p->isQmlType() || p->isJsType()) && p->isAbstract()) - href.clear(); - } + if (p && (p->isQmlType() || p->isJsType()) && p->isAbstract()) + href.clear(); } if (!href.isEmpty()) writer.writeAttribute("href", href); @@ -1164,13 +1133,6 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter &writer, Node *node, writer.writeAttribute("brief", brief); } break; - case Node::JsPropertyGroup: - case Node::QmlPropertyGroup: - { - if (!brief.isEmpty()) - writer.writeAttribute("brief", brief); - } - break; case Node::Property: { const PropertyNode* propertyNode = static_cast<const PropertyNode*>(node); |