summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdoc/generatedoutput/testdata
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testdata')
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp15
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h5
2 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
index 31b910fae..e43ecf0b7 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
@@ -155,6 +155,11 @@ void Test::virtualFun()
}
/*!
+ \typedef Test::SomeType
+ \brief A typedef.
+*/
+
+/*!
\reimp
*/
void TestDerived::virtualFun()
@@ -173,6 +178,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 cb812375b..b9644eb94 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h
@@ -41,6 +41,9 @@ public:
OmittedValue = 99
};
#endif
+ typedef struct {
+ int data;
+ } SomeType;
int someFunction(int v = 0);
void someFunctionDefaultArg(int i, bool b);
void obsoleteMember();
@@ -61,6 +64,8 @@ protected:
class TestDerived : public Test {
public:
+ using DerivedType = Test::SomeType;
+ using NotTypedef = int;
void virtualFun() override;
};