diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-12 12:16:15 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-18 13:31:02 +0000 |
| commit | f4c623deb3ba006e9dd903bfa4581e841029b058 (patch) | |
| tree | 7949943ea6ae433e4de417a9ebe67b4327558f4d /src/qdoc/cppcodeparser.cpp | |
| parent | a562481132905d695588a53534afbfed5c44dda2 (diff) | |
| download | qttools-f4c623deb3ba006e9dd903bfa4581e841029b058.tar.gz | |
Rename QML basic types to value types
Internally they've been called value types for a long time and they are
not really basic.
[ChangeLog][qdoc] QML value types are now marked with the \qmlvaluetype
directive, rather than \qmlbasictype. \qmlbasictype still works but is
deprecated. So far, all value types are hardcoded into the QML engine,
making the directive irrelevant for user projects. This will change.
Change-Id: I915ea0388e1de4c18911f7e81ba29559ebf33cb7
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 5314f3052..a32bb2b19 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -74,7 +74,8 @@ CppCodeParser::CppCodeParser() << COMMAND_QMLPROPERTYGROUP // mws 13/03/2019 << COMMAND_QMLATTACHEDPROPERTY << COMMAND_QMLSIGNAL << COMMAND_QMLATTACHEDSIGNAL << COMMAND_QMLMETHOD - << COMMAND_QMLATTACHEDMETHOD << COMMAND_QMLBASICTYPE << COMMAND_QMLMODULE + << COMMAND_QMLATTACHEDMETHOD << COMMAND_QMLVALUETYPE << COMMAND_QMLBASICTYPE + << COMMAND_QMLMODULE << COMMAND_JSTYPE << COMMAND_JSPROPERTY << COMMAND_JSPROPERTYGROUP // mws 13/03/2019 << COMMAND_JSATTACHEDPROPERTY << COMMAND_JSSIGNAL << COMMAND_JSATTACHEDSIGNAL @@ -335,12 +336,12 @@ Node *CppCodeParser::processTopicCommand(const Doc &doc, const QString &command, qcn = new QmlTypeNode(m_qdb->primaryTreeRoot(), arg.first, Node::JsType); qcn->setLocation(doc.startLocation()); return qcn; - } else if (command == COMMAND_QMLBASICTYPE) { - auto *node = new QmlBasicTypeNode(m_qdb->primaryTreeRoot(), arg.first); + } else if (command == COMMAND_QMLVALUETYPE || command == COMMAND_QMLBASICTYPE) { + auto *node = new QmlValueTypeNode(m_qdb->primaryTreeRoot(), arg.first); node->setLocation(doc.startLocation()); return node; } else if (command == COMMAND_JSBASICTYPE) { - auto *node = new QmlBasicTypeNode(m_qdb->primaryTreeRoot(), arg.first, Node::JsBasicType); + auto *node = new QmlValueTypeNode(m_qdb->primaryTreeRoot(), arg.first, Node::JsBasicType); node->setLocation(doc.startLocation()); return node; } else if ((command == COMMAND_QMLSIGNAL) || (command == COMMAND_QMLMETHOD) |