Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I8c1fc05462e1b99b16d52e4f43b2b4b1aa645152

1 files changed, 6 insertions, 0 deletions

diff --git a/src/qdoc/xmlgenerator.cpp b/src/qdoc/xmlgenerator.cpp
index 78e3b81e0..a04c24464 100644
--- a/src/qdoc/xmlgenerator.cpp
+++ b/src/qdoc/xmlgenerator.cpp
@@ -72,6 +72,7 @@ int XmlGenerator::hOffset(const Node *node)
     case Node::Page:
         return 1;
     case Node::Enum:
+    case Node::TypeAlias:
     case Node::Typedef:
     case Node::Function:
     case Node::Property:
@@ -235,6 +236,9 @@ QString XmlGenerator::refForNode(const Node *node)
     case Node::Enum:
         ref = node->name() + "-enum";
         break;
+    case Node::TypeAlias:
+        ref = node->name() + "-alias";
+        break;
     case Node::Typedef: {
         const auto tdn = static_cast<const TypedefNode *>(node);
         if (tdn->associatedEnum())
@@ -446,6 +450,8 @@ QString XmlGenerator::targetType(const Node *node)
         return QStringLiteral("page");
     case Node::Enum:
         return QStringLiteral("enum");
+    case Node::TypeAlias:
+        return QStringLiteral("alias");
     case Node::Typedef:
         return QStringLiteral("typedef");
     case Node::Property: