diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-12-07 12:43:17 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-01-27 12:20:17 +0100 |
| commit | c659dc3390dd1bfa298adf1531b731963ac91dc5 (patch) | |
| tree | d46c77322379504cf4292df1fe0f7e123fd311d2 /tests | |
| parent | 10488623eb0baf70e906875b30d9c4d9067ea9b1 (diff) | |
| download | qttools-c659dc3390dd1bfa298adf1531b731963ac91dc5.tar.gz | |
qdoc: Remove demos-manifest.xml file
The separation between 'examples' and 'demos' is not used anymore.
Also, Qt Creator since quite a long time does just read both files,
and treat them exactly the same.
Pick-to: 6.5
Change-Id: I307b32f1c87c849b0b8a1e19d7604fbbd5989d1f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'tests')
4 files changed, 5 insertions, 11 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml b/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml deleted file mode 100644 index 5cbdf3f62..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/demos-manifest.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<instructionals module="Test"> - <demos> - <demo docUrl="qthelp://org.qt-project.test.001/test/test-demos-demo-example.html" imageUrl="qthelp://org.qt-project.test.001/test/images/leonardo-da-vinci.png" isTest="true" name="Demo" projectPath="test/demos/demo/demo.pro"> - <description><![CDATA[No description available]]></description> - <tags>test</tags> - </demo> - </demos> -</instructionals> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml b/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml index bbce463eb..89a4f0553 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml +++ b/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml @@ -6,6 +6,10 @@ <tags>test</tags> <fileToOpen mainFile="true">test/cmaketest/main.cpp</fileToOpen> </example> + <example docUrl="qthelp://org.qt-project.test.001/test/test-demos-demo-example.html" imageUrl="qthelp://org.qt-project.test.001/test/images/leonardo-da-vinci.png" isTest="true" name="Demo" projectPath="test/demos/demo/demo.pro"> + <description><![CDATA[No description available]]></description> + <tags>test</tags> + </example> <example docUrl="qthelp://org.qt-project.test.001/test/test-componentset-example.html" isTest="true" name="QML Documentation Example" projectPath="tutorials/componentset/componentset.pro"> <description><![CDATA[Example for documenting QML types.]]></description> <tags>sample,test</tags> diff --git a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc b/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc index 2b5d64123..dddcbc074 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc +++ b/tests/auto/qdoc/generatedoutput/testdata/examples/demos/hidden/doc/src/hidden.qdoc @@ -5,7 +5,7 @@ \example demos/hidden \title Hidden Demo \meta tag broken - \brief Tagged 'broken', does not appear in demos-manifest.xml. + \brief Tagged 'broken', does not appear in examples-manifest.xml. Also missing an image, but that's OK as it's broken anyway. */ diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index d45750476..5c013639a 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -352,7 +352,6 @@ void tst_generatedOutput::examplesManifestXmlAndQhp() { testAndCompare("testdata/configs/examples-qhp.qdocconf", "examples-manifest.xml " - "demos-manifest.xml " "test.qhp"); } |