diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-18 11:31:50 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-18 11:31:50 (GMT) |
| commit | 68073bbcde2d1b12d36f0c58aab1fc20f02ab967 (patch) | |
| tree | a3b0bb1a56edf47e16f9c37b3142e41b2fc11600 /tools/qdoc3/pagegenerator.cpp | |
| parent | 9e7f0b9e45cef278c8874539257b4038a0aa6615 (diff) | |
| download | Qt-68073bbcde2d1b12d36f0c58aab1fc20f02ab967.zip Qt-68073bbcde2d1b12d36f0c58aab1fc20f02ab967.tar.gz Qt-68073bbcde2d1b12d36f0c58aab1fc20f02ab967.tar.bz2 | |
qdoc: Added a workaround for QML/Qt class name clashes.
Reviewed-by: Trust Me
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
| -rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index cd364ef..a187c2e 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -209,7 +209,8 @@ QString PageGenerator::fileBase(const Node *node) const */ if ((p->subType() == Node::QmlClass) || (p->subType() == Node::QmlBasicType)) { - base.prepend("qml-"); + if (!base.startsWith(QLatin1String("QML:"))) + base.prepend("qml-"); } #endif if (!pp || pp->name().isEmpty() || pp->type() == Node::Fake) |