diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-25 03:00:47 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-25 03:00:47 +0100 |
commit | 94c0fd2b718332f9307b6de4e3863540612aed54 (patch) | |
tree | b40790b12a25cd60ce276836d2cbadbf6b3f6f71 /tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml | |
parent | 402ebd2dbb121dc2dfe8866b663c9c7c6e80200c (diff) | |
parent | d8a971b8475035f61e1ad3baaef6a8c49556c42d (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iabcee67b9cf246cd5f1fe97205ed41b4763210ec
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml')
-rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml index 94dee89e3..4a56533a4 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml +++ b/tests/auto/qdoc/generatedoutput/expected_output/html/qdoctests-qdocfileoutput.webxml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <WebXML> <document> - <page name="qdoctests-qdocfileoutput.html" href="qdoctests-qdocfileoutput.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc output from .qdoc files" fulltitle="Testing QDoc output from .qdoc files" subtitle="" module="Test" brief="This is a simple page for testing purposes only"> + <page name="qdoctests-qdocfileoutput.html" href="qdoctests-qdocfileoutput.html" status="active" location="qdoctests-outputfromqdocfiles.qdoc" documented="true" subtype="page" title="Testing QDoc output from .qdoc files" fulltitle="Testing QDoc output from .qdoc files" subtitle="" module="OutputFromQDocFiles" brief="This is a simple page for testing purposes only"> <contents name="supported-file-types" title="Supported file types" level="1"/> <contents name="further-information" title="Further information" level="1"/> <contents name="linking" title="Linking" level="1"/> |