diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-05-29 07:43:02 +0000 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-05-29 12:24:07 +0200 |
| commit | 714e11930bed1dbcc9e20f4c37c68f10bd3882a3 (patch) | |
| tree | 4f252f3fe2b9baf21933ce070d791b1279f5cde2 /src/qdoc/cppcodeparser.cpp | |
| parent | be1735117b5e9c9d3634f7be71ab1af913319f3d (diff) | |
| parent | 814f95db87f469abf8386825cf2db2ecc208c62b (diff) | |
| download | qttools-714e11930bed1dbcc9e20f4c37c68f10bd3882a3.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I8c1fc05462e1b99b16d52e4f43b2b4b1aa645152
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index a5ed77ea3..30ad23bb4 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -96,7 +96,7 @@ void CppCodeParser::initializeParser() m_nodeTypeMap.insert(COMMAND_STRUCT, Node::Struct); m_nodeTypeMap.insert(COMMAND_UNION, Node::Union); m_nodeTypeMap.insert(COMMAND_ENUM, Node::Enum); - m_nodeTypeMap.insert(COMMAND_TYPEALIAS, Node::Typedef); + m_nodeTypeMap.insert(COMMAND_TYPEALIAS, Node::TypeAlias); m_nodeTypeMap.insert(COMMAND_TYPEDEF, Node::Typedef); m_nodeTypeMap.insert(COMMAND_PROPERTY, Node::Property); m_nodeTypeMap.insert(COMMAND_VARIABLE, Node::Variable); @@ -106,7 +106,7 @@ void CppCodeParser::initializeParser() m_nodeTypeTestFuncMap.insert(COMMAND_STRUCT, &Node::isStruct); m_nodeTypeTestFuncMap.insert(COMMAND_UNION, &Node::isUnion); m_nodeTypeTestFuncMap.insert(COMMAND_ENUM, &Node::isEnumType); - m_nodeTypeTestFuncMap.insert(COMMAND_TYPEALIAS, &Node::isTypedef); + m_nodeTypeTestFuncMap.insert(COMMAND_TYPEALIAS, &Node::isTypeAlias); m_nodeTypeTestFuncMap.insert(COMMAND_TYPEDEF, &Node::isTypedef); m_nodeTypeTestFuncMap.insert(COMMAND_PROPERTY, &Node::isProperty); m_nodeTypeTestFuncMap.insert(COMMAND_VARIABLE, &Node::isVariable); |