diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 19:27:05 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 19:27:05 (GMT) |
| commit | 986873b239f15df43a3ebbc88a38f8ff8d6d07bf (patch) | |
| tree | 946f585f390d3abb835a3280bbdc6bc90724977c /tools/qdoc3/generator.cpp | |
| parent | b7f48eee301e973fcfae08dfd8997538b6dbe251 (diff) | |
| parent | 3671dbf34940e166b747b6f8f3f5758fd486073c (diff) | |
| download | Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.zip Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.gz Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
Diffstat (limited to 'tools/qdoc3/generator.cpp')
| -rw-r--r-- | tools/qdoc3/generator.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index 0e90615..c5b150c 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -1194,14 +1194,22 @@ void Generator::appendSortedQmlNames(Text& text, QMap<QString,Text> classMap; int index = 0; +<<<<<<< HEAD #ifdef DEBUG_MULTIPLE +======= +#ifdef DEBUG_MULTIPLE_QDOCCONF_FILES +>>>>>>> origin/4.7 qDebug() << "Generator::appendSortedQmlNames():" << base->name() << "is inherited by..."; -#endif +#endif for (int i = 0; i < subs.size(); ++i) { Text t; +<<<<<<< HEAD #ifdef DEBUG_MULTIPLE +======= +#ifdef DEBUG_MULTIPLE_QDOCCONF_FILES +>>>>>>> origin/4.7 qDebug() << " " << subs[i]->name(); -#endif +#endif appendFullName(t, subs[i], base, marker); classMap[t.toString().toLower()] = t; } |