diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 22:39:15 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 22:39:15 +0100 |
| commit | 7474ad656269aec1352d166bb5a4435086d48482 (patch) | |
| tree | 2791036aa8644ab759dc81eb7317de78589026a9 /tools | |
| parent | 7a413f40f8db4f20277f153c1e771da478a5e991 (diff) | |
| parent | 5762a988fbcd95c9c44e58993c25f5cd1d53f897 (diff) | |
| download | qt4-tools-7474ad656269aec1352d166bb5a4435086d48482.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use a shared QScriptEngine for debugger console command scripts
Fix QtScript debugger hang/crash issue with updating locals model
doc: Fixed some qdoc warnings.
Always activate popup windows on show
doc: Fixed some qdoc warnings.
Add the QMAKE_FILE_EXT variable to extra compilers generation.
Cocoa: Tool Windows steal focus from the main window
qdoc3: Removed a debug output.
Update QTestLib documentation with chart use case.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/node.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 4da916cbe5..9357671929 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -570,8 +570,6 @@ void InnerNode::addChild(Node *child) else { if (child->type() == Enum) enumChildren.append(child); - if (childMap.contains(child->name())) - qDebug() << "Duplicate child" << child->name(); childMap.insert(child->name(), child); } } |