diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
| commit | 2a898e4736dcafbe95dca120b2365bc24b395302 (patch) | |
| tree | 3031380514df8b82e423ded0401610bcbf89b6cf /tools/qdoc3/pagegenerator.cpp | |
| parent | 8b3fad1f7ac9bef0119fffc67feb5bb153abc647 (diff) | |
| parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
| download | Qt-2a898e4736dcafbe95dca120b2365bc24b395302.zip Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.gz Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.bz2 | |
Merge remote branch 'qt/master' into qml-master
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
| -rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index f129d3a..2cad9ed 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -84,7 +84,7 @@ QString PageGenerator::fileBase(const Node *node) const else if (!node->isInnerNode()) node = node->parent(); #ifdef QDOC_QML - if (node->subType() == Node::QDeclarativePropertyGroup) { + if (node->subType() == Node::QmlPropertyGroup) { node = node->parent(); } #endif @@ -104,8 +104,8 @@ QString PageGenerator::fileBase(const Node *node) const we prepend "qml-" to the file name of QML element doc files. */ - if ((p->subType() == Node::QDeclarativeClass) || - (p->subType() == Node::QDeclarativeBasicType)) { + if ((p->subType() == Node::QmlClass) || + (p->subType() == Node::QmlBasicType)) { base.prepend("qml-"); } #endif @@ -207,7 +207,7 @@ void PageGenerator::generateInnerNode(const InnerNode *node, if (fakeNode->subType() == Node::ExternalPage) return; #ifdef QDOC_QML - if (fakeNode->subType() == Node::QDeclarativePropertyGroup) + if (fakeNode->subType() == Node::QmlPropertyGroup) return; #endif if (fakeNode->subType() == Node::Page) { |