diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-29 10:08:13 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-29 10:08:13 (GMT) |
| commit | c2a68020e7c6d50197e8f3f65186845fee91f3db (patch) | |
| tree | f6a914d648858ea6069b87e48a3aec8d6ad48305 /tools/qdoc3/generator.cpp | |
| parent | 0f7ba7f6d1333139395a06a1b679db6368bf8dfa (diff) | |
| parent | 4d35d5a997d873d7be4d453651219ab9b680e9fa (diff) | |
| download | Qt-c2a68020e7c6d50197e8f3f65186845fee91f3db.zip Qt-c2a68020e7c6d50197e8f3f65186845fee91f3db.tar.gz Qt-c2a68020e7c6d50197e8f3f65186845fee91f3db.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'tools/qdoc3/generator.cpp')
| -rw-r--r-- | tools/qdoc3/generator.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 1a41399..165bd5e 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -984,23 +984,26 @@ void Generator::generateThreadSafeness(const Node *node, CodeMarker *marker) NodeList nonreentrant; NodeList::ConstIterator c = innerNode->childNodes().begin(); while (c != innerNode->childNodes().end()) { - switch ((*c)->threadSafeness()) { - case Node::Reentrant: - reentrant.append(*c); - if (threadSafeness == Node::ThreadSafe) - exceptions = true; - break; - case Node::ThreadSafe: - threadsafe.append(*c); - if (threadSafeness == Node::Reentrant) + + if ((*c)->status() != Node::Obsolete){ + switch ((*c)->threadSafeness()) { + case Node::Reentrant: + reentrant.append(*c); + if (threadSafeness == Node::ThreadSafe) + exceptions = true; + break; + case Node::ThreadSafe: + threadsafe.append(*c); + if (threadSafeness == Node::Reentrant) + exceptions = true; + break; + case Node::NonReentrant: + nonreentrant.append(*c); exceptions = true; - break; - case Node::NonReentrant: - nonreentrant.append(*c); - exceptions = true; - break; - default: - break; + break; + default: + break; + } } ++c; } |