diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-15 14:06:46 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-15 15:08:54 +0200 |
commit | e6ad150805cc64db20d3ff3ae5fe2d356c04913b (patch) | |
tree | 0b3b6ea949c5a42005d564b79b1783b935f1a85e /tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml | |
parent | 830f1db786de48d34b16905086220a6ac28a0203 (diff) | |
parent | 1b992406a6523a144c58baa9bbd1198bb9a2d98c (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
a bunch of .pro and configure.json file adjustments
and some conflicting cherry-picks from dev -> 5.15
that are merged into dev again
src/assistant/assistant/main.cpp
Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml')
-rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml new file mode 100644 index 000000000..d2ba83a13 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/testcpp-module.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<db:article xmlns:db="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.2" xml:lang="en"> +<db:info> +<db:title>QDoc Test C++ Classes</db:title> +<db:productname>Test</db:productname> +<db:titleabbrev>A test project for QDoc build artifacts</db:titleabbrev> +<db:abstract> +<db:para>A test module page.</db:para> +</db:abstract> +</db:info> +<db:para>A test module page.</db:para> +<db:section xml:id="details"> +<db:title>Detailed Description</db:title> +</db:section> +</db:article> |