diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 14:06:06 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 14:06:06 +0200 |
commit | 814f95db87f469abf8386825cf2db2ecc208c62b (patch) | |
tree | 3ba8bd58aa20e8fab166be6e3957dd98edbcc72d /tests/auto/qdoc/generatedoutput/testdata | |
parent | ef0ea4f2cfa3dbcf2f3347a661670b38eeea2106 (diff) | |
parent | 94e861104a1d689dfd12018e7be377699ab24917 (diff) |
Merge remote-tracking branch 'origin/5.15.0' into 5.15
Change-Id: I603c595fa1a4f91838d2766e15b3b1fd7e0c7f72
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testdata')
-rw-r--r-- | tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp | 15 | ||||
-rw-r--r-- | tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.h | 5 |
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; }; |