diff options
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index a705575a8..a56e0fd7d 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -171,13 +171,6 @@ void tst_generatedOutput::htmlFromQDocFile() "qdoctests-qdocfileoutput-linking.html"); } -void tst_generatedOutput::webXmlFromQDocFile() -{ - testAndCompare("webxml_test.qdocconf", - "html/qdoctests-qdocfileoutput.webxml " - "html/qdoctests-qdocfileoutput-linking.webxml"); -} - void tst_generatedOutput::htmlFromCpp() { testAndCompare("testcpp.qdocconf", @@ -187,16 +180,6 @@ void tst_generatedOutput::htmlFromCpp() "testqdoc.html"); } - -void tst_generatedOutput::webXmlFromCpp() -{ - testAndCompare("webxml_testcpp.qdocconf", - "html/testcpp-module.webxml " - "html/testqdoc-test.webxml " - "html/testqdoc-testderived.webxml"); -} - - void tst_generatedOutput::htmlFromQml() { testAndCompare("testqml.qdocconf", @@ -214,13 +197,6 @@ void tst_generatedOutput::htmlFromQml() "qml-int.html"); } -void tst_generatedOutput::webXmlFromQml() -{ - testAndCompare("webxml_testqml.qdocconf", - "html/test-componentset-example.webxml " - "html/uicomponents-qmlmodule.webxml"); -} - void tst_generatedOutput::htmlFromCppBug80259() { testAndCompare("bug80259/testmodule.qdocconf", @@ -230,6 +206,29 @@ void tst_generatedOutput::htmlFromCppBug80259() "index.html"); } +void tst_generatedOutput::webXmlFromQDocFile() +{ + testAndCompare("webxml_test.qdocconf", + "html/qdoctests-qdocfileoutput.webxml " + "html/qdoctests-qdocfileoutput-linking.webxml"); +} + +void tst_generatedOutput::webXmlFromCpp() +{ + testAndCompare("webxml_testcpp.qdocconf", + "html/testcpp-module.webxml " + "html/testqdoc-test.webxml " + "html/testqdoc-testderived.webxml"); +} + + +void tst_generatedOutput::webXmlFromQml() +{ + testAndCompare("webxml_testqml.qdocconf", + "html/test-componentset-example.webxml " + "html/uicomponents-qmlmodule.webxml"); +} + void tst_generatedOutput::webXmlFromCppBug80259() { testAndCompare("bug80259/webxml_testmodule.qdocconf", |