summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp')
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp20
1 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 d80267154..9d321c65c 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
@@ -130,6 +130,14 @@ namespace TestQDoc {
*/
/*!
+\if defined(test_properties)
+ \property Test::id
+\else
+ \nothing
+\endif
+*/
+
+/*!
\deprecated [6.0] Use someFunction() instead.
*/
void Test::deprecatedMember()
@@ -277,6 +285,18 @@ void TestDerived::staticObsoleteMember()
*/
/*!
+\if defined(test_properties)
+ \reimp
+\else
+ \nothing
+\endif
+*/
+int TestDerived::id()
+{
+ return 1;
+}
+
+/*!
\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.