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/node.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/node.cpp')
| -rw-r--r-- | src/qdoc/node.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 8c23009b0..43e4a78f0 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -110,7 +110,8 @@ void Node::initialize() goals.insert("qmlsignal", Node::Function); goals.insert("qmlsignalhandler", Node::Function); goals.insert("qmlmethod", Node::Function); - goals.insert("qmlbasictype", Node::QmlBasicType); + goals.insert("qmlvaluetype", Node::QmlValueType); + goals.insert("qmlbasictype", Node::QmlValueType); // deprecated! goals.insert("sharedcomment", Node::SharedComment); goals.insert("collection", Node::Collection); } @@ -138,7 +139,7 @@ bool Node::changeType(NodeType from, NodeType to) case QmlType: case QmlModule: case QmlProperty: - case QmlBasicType: + case QmlValueType: setGenus(Node::QML); break; case JsType: @@ -786,7 +787,7 @@ Node::PageType Node::getPageType(Node::NodeType t) case Node::Variable: case Node::QmlType: case Node::QmlProperty: - case Node::QmlBasicType: + case Node::QmlValueType: case Node::JsType: case Node::JsProperty: case Node::JsBasicType: @@ -836,7 +837,7 @@ Node::Genus Node::getGenus(Node::NodeType t) case Node::QmlType: case Node::QmlModule: case Node::QmlProperty: - case Node::QmlBasicType: + case Node::QmlValueType: return Node::QML; case Node::JsType: case Node::JsModule: @@ -931,7 +932,7 @@ QString Node::nodeTypeString(NodeType t) case QmlType: return QLatin1String("QML type"); - case QmlBasicType: + case QmlValueType: return QLatin1String("QML basic type"); case QmlModule: return QLatin1String("QML module"); |