summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-03-25 21:52:49 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2020-03-26 08:56:40 +0000
commit9a3c1a3ef004bdd948524afc37050a617a6e4823 (patch)
tree72ac7beb2cceda6c7cd38773a1613dbdc010eb8d /tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
parent4e35093ea7f6be6caf34b0627fbaffab984a5e0f (diff)
qdoc: Ensure macros as a macro parameter are expanded
QDoc allows macros to be nested, and macro parameters can also be other macros, but in one code path the parameter was read verbatim, i.e. not expanded. This is an unnecessary restriction so remove it. Fixes: QTBUG-83085 Change-Id: I6dc7c2f7586a65bee78096fb50685262dad2ffe3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp')
-rw-r--r--tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
index 8422494ac..17045eed5 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
@@ -36,6 +36,10 @@ namespace TestQDoc {
\brief A test module page.
\testnoautolist
+
+\if defined(test_nestedmacro)
+ \versionnote {module} {\ver}
+\endif
*/
/*!