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

Change-Id: I8c1fc05462e1b99b16d52e4f43b2b4b1aa645152

2 files changed, 32 insertions, 8 deletions

diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
index 3398be996..2343e7918 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
@@ -125,13 +125,7 @@ void Test::someFunctionDefaultArg(int i, bool b = false)
     return;
 }
 
-/*!
-    Function that takes a parameter \a v.
-    Also returns the value of \a v.
-\if defined(test_ignoresince)
-    \since Test 1.0
-\endif
-*/
+// Documented below with an \fn command. Unnecessary but we support it, and it's used.
 int Test::someFunction(int v)
 {
     return v;
@@ -144,6 +138,16 @@ int Test::someFunction(int v)
 */
 
 /*!
+    \fn int Test::someFunction(int v = 0)
+
+    Function that takes a parameter \a v.
+    Also returns the value of \a v.
+\if defined(test_ignoresince)
+    \since Test 1.0
+\endif
+*/
+
+/*!
     Function that must be reimplemented.
 */
 void Test::virtualFun()
@@ -152,6 +156,11 @@ void Test::virtualFun()
 }
 
 /*!
+    \typedef Test::SomeType
+    \brief A typedef.
+*/
+
+/*!
     \reimp
 */
 void TestDerived::virtualFun()
@@ -170,6 +179,16 @@ void TestDerived::virtualFun()
 */
 
 /*!
+    \typealias TestDerived::DerivedType
+    An aliased typedef.
+*/
+
+/*!
+    \typedef TestDerived::NotTypedef
+    I'm an alias, not a typedef.
+*/
+
+/*!
 \if defined(test_template)
     \fn template <typename T1, typename T2> void TestQDoc::Test::funcTemplate(T1 a, T2 b)
     \brief Function template with two parameters, \a a and \a b.
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
index 4ae33a404..b9644eb94 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
@@ -41,7 +41,10 @@ public:
         OmittedValue = 99
     };
 #endif
-    int someFunction(int v);
+    typedef struct {
+        int data;
+    } SomeType;
+    int someFunction(int v = 0);
     void someFunctionDefaultArg(int i, bool b);
     void obsoleteMember();
     void anotherObsoleteMember();
@@ -61,6 +64,8 @@ protected:
 
 class TestDerived : public Test {
 public:
+    using DerivedType = Test::SomeType;
+    using NotTypedef = int;
     void virtualFun() override;
 };