diff options
author | Martin Smith <msmith@trolltech.com> | 2010-03-02 08:40:55 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-03-02 08:40:55 (GMT) |
commit | 5363237c164667aa38433eefe8646aafee328b59 (patch) | |
tree | a14e834196a6ea467ec594246df868c2ee7fa2a0 /tools/qdoc3/node.cpp | |
parent | f309c1cc1b0212f1c882fca5adb0e7d7ef552de9 (diff) | |
download | Qt-5363237c164667aa38433eefe8646aafee328b59.zip Qt-5363237c164667aa38433eefe8646aafee328b59.tar.gz Qt-5363237c164667aa38433eefe8646aafee328b59.tar.bz2 |
qdoc: Second attempt, QML doc stuff.
This change caused a crash on several platforms before,
but not on mine, of course. It outputs a list of new
QML elements on the What's New in 4.7 page, and it
outputs the "Inherited by" list on each QML elemnent
page for elements that are inherited by other elements.
I can't see why it should crash anything, but I have
included some debug output. I think the crash might
have something to do with QList<T>, which qdoc3 uses
heavily. If it crashes for you, please get a stack
trace and the debug output.
Diffstat (limited to 'tools/qdoc3/node.cpp')
-rw-r--r-- | tools/qdoc3/node.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 358fdd1..d2ffff5 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -1257,7 +1257,7 @@ bool TargetNode::isInnerNode() const #ifdef QDOC_QML bool QmlClassNode::qmlOnly = false; -QMultiMap<QString,QString> QmlClassNode::inheritedBy; +QMultiMap<QString,Node*> QmlClassNode::inheritedBy; /*! Constructs a Qml class node (i.e. a Fake node with the @@ -1302,15 +1302,16 @@ QString QmlClassNode::fileBase() const Record the fact that QML class \a base is inherited by QML class \a sub. */ -void QmlClassNode::addInheritedBy(const QString& base, const QString& sub) +void QmlClassNode::addInheritedBy(const QString& base, Node* sub) { + //qDebug() << "QmlClassNode::addInheritedBy(): insert" << base << sub->name(); inheritedBy.insert(base,sub); } /*! - Loads the list \a subs with the names of all the subclasses of \a base. + Loads the list \a subs with the nodes of all the subclasses of \a base. */ -void QmlClassNode::subclasses(const QString& base, QStringList& subs) +void QmlClassNode::subclasses(const QString& base, NodeList& subs) { subs.clear(); if (inheritedBy.contains(base)) |