diff options
author | Martin Smith <msmith@trolltech.com> | 2010-03-03 10:35:33 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-03-03 10:35:33 (GMT) |
commit | 509ac7e069bf17f2725dcebdeb8e9520b98b0e15 (patch) | |
tree | 7ccad03094751d948661d6a26e6e0cfc509b33bd | |
parent | ca88b39490ef09b56cab5f933c9e33e5a2f5a498 (diff) | |
download | Qt-509ac7e069bf17f2725dcebdeb8e9520b98b0e15.zip Qt-509ac7e069bf17f2725dcebdeb8e9520b98b0e15.tar.gz Qt-509ac7e069bf17f2725dcebdeb8e9520b98b0e15.tar.bz2 |
qdoc3: Trying to find a bug that causes a crash.
It doesn't crash on OS X, but it does on some other platforms.
If you run into this crash running qdoc3, you can work around
it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp
The line to comment out is:
generateQmlInheritedBy(qml_cn, marker);
-rw-r--r-- | tools/qdoc3/generator.cpp | 10 | ||||
-rw-r--r-- | tools/qdoc3/node.cpp | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 0ef5156..c8a39ef 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -1190,19 +1190,15 @@ void Generator::appendSortedQmlNames(Text& text, const NodeList& subs, CodeMarker *marker) { - NodeList::ConstIterator r; QMap<QString,Text> classMap; int index = 0; qDebug() << "Generator::appendSortedQmlNames():" << base->name() << "is inherited by..."; - - r = subs.begin(); - while (r != subs.end()) { + for (int i = 0; i < subs.size(); ++i) { Text t; - qDebug() << " " << (*r)->name(); - appendFullName(t, (*r), base, marker); + qDebug() << " " << subs[i]->name(); + appendFullName(t, subs[i], base, marker); classMap[t.toString().toLower()] = t; - ++r; } QStringList names = classMap.keys(); diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 7dda824..5415559 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -1315,8 +1315,11 @@ void QmlClassNode::addInheritedBy(const QString& base, Node* sub) void QmlClassNode::subclasses(const QString& base, NodeList& subs) { subs.clear(); - if (inheritedBy.contains(base)) + if (inheritedBy.count(base) > 0) { subs = inheritedBy.values(base); + qDebug() << "QmlClassNode::subclasses():" << inheritedBy.count(base) << base + << "subs:" << subs.size(); + } } /*! |