diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-07-26 10:48:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-26 14:24:40 +0200 |
| commit | 3658eedc971a62a5ea8b202e0dd9f89abacdb61e (patch) | |
| tree | 8b4fd5a0d7e7cc6cd07733ddb7d68060177951a5 /src/tools/qdoc/node.cpp | |
| parent | 353069f974c62ef758b1496881a03fcb6ca51476 (diff) | |
qdoc: Changed \qmlclass to \qmltype, added \instantiates
The \qmlclass qdoc command is now deprecated. Use \qmltype instead.
\qmlclass had two arguments, the QML type name and, if the QML type
was elemental, the name of the C++ class that the QML element
instantiates. The \qmltype command has only one argument, the QML type
name.
If the QML type is elemental, then the \qmltype command should be
followed by a \instantiates context command in the same qdoc
comment. e.g.:
\qmltype Item
\instantiates QDeclarativeItem
When the developer does not include the \instantiates command for an
elemental QML type, qdoc will no longer be able to detect that the C++
class name is missing, and qdoc will no longer be able to detect when
the name specified for a \qmlproperty of the elemental QML type has
the wrong name.
Task nr: QTBUG-26648
Change-Id: Ia60872a35113a6f615bfc751ce1e9db6279dfb8e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/node.cpp')
| -rw-r--r-- | src/tools/qdoc/node.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index 1464603db5f..7931cab0a2a 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -2006,17 +2006,13 @@ QMap<QString, QmlClassNode*> QmlClassNode::qmlModuleMemberMap_; /*! Constructs a Qml class node (i.e. a Fake node with the subtype QmlClass. The new node has the given \a parent - and \a name and is associated with the C++ class node - specified by \a cn which may be null if the the Qml - class node is not associated with a C++ class node. + and \a name. */ -QmlClassNode::QmlClassNode(InnerNode *parent, - const QString& name, - ClassNode* cn) +QmlClassNode::QmlClassNode(InnerNode *parent, const QString& name) : FakeNode(parent, name, QmlClass, Node::ApiPage), abstract_(false), cnodeRequired_(false), - cnode_(cn), + cnode_(0), base_(0) { int i = 0; |