diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-23 04:57:10 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-23 04:57:10 (GMT) |
| commit | 5dffa762ad42ea77e09ac6b21eb79ca19a2aef4b (patch) | |
| tree | 1d45f300315a93efdfbe19c00b6bcc5bbdb990ce | |
| parent | bea6223ce782aae26c1c0fb7ee5166403b2056bb (diff) | |
| download | Qt-5dffa762ad42ea77e09ac6b21eb79ca19a2aef4b.zip Qt-5dffa762ad42ea77e09ac6b21eb79ca19a2aef4b.tar.gz Qt-5dffa762ad42ea77e09ac6b21eb79ca19a2aef4b.tar.bz2 | |
Change the QML element docs filename prefix "qml-" rather than "qml".
Otherwise there is a clash with the QmlFoo C++ classes.
| -rw-r--r-- | tools/qdoc3/node.cpp | 4 | ||||
| -rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 9e7e306..4734374 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -1040,7 +1040,7 @@ QmlClassNode::QmlClassNode(InnerNode *parent, } /*! - The base file name for this kind of node has "qml" + The base file name for this kind of node has "qml_" prepended to it. But not yet. Still testing. @@ -1050,7 +1050,7 @@ QString QmlClassNode::fileBase() const #if 0 if (Node::fileBase() == "item") qDebug() << "FILEBASE: qmlitem" << name(); - return "qml" + Node::fileBase(); + return "qml_" + Node::fileBase(); #endif return Node::fileBase(); } diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 8504d2d..e92a067 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -101,16 +101,16 @@ QString PageGenerator::fileBase(const Node *node) #ifdef QDOC_QML /* To avoid file name conflicts in the html directory, - we prepend "qml" to the file name of QML element doc + we prepend "qml-" to the file name of QML element doc files. */ if ((p->subType() == Node::QmlClass) || (p->subType() == Node::QmlPropertyGroup)) - base.prepend("qml"); + base.prepend("qml-"); else if ((p->type() == Node::QmlProperty) || (p->type() == Node::QmlSignal) || (p->type() == Node::QmlMethod)) - base.prepend("qml"); + base.prepend("qml-"); #endif const Node *pp = p->parent(); if (!pp || pp->name().isEmpty() || pp->type() == Node::Fake) |