From 4970167b75fb83bd46227d9d9315b6e215c8e457 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Sun, 5 Jan 2020 13:04:24 +0100 Subject: QDoc: Drop xml prolog from html output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The html output is not well-formed xml, so let's not claim that it is. Update expected output in tests to reflect the change in output. Task-number: QTBUG-73026 Change-Id: I0e6646eb33cafad7be543869585609d6f4cb0fdb Reviewed-by: Topi Reiniö --- src/qdoc/htmlgenerator.cpp | 5 ----- tests/auto/qdoc/generatedoutput/expected_output/first.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/index.html | 1 - .../qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html | 1 - .../expected_output/qdoctests-qdocfileoutput-linking.html | 1 - .../generatedoutput/expected_output/qdoctests-qdocfileoutput.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/qml-int.html | 1 - .../expected_output/qml-qdoc-test-abstractparent.html | 1 - .../qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html | 1 - .../qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html | 1 - .../generatedoutput/expected_output/qml-qdoc-test-type-members.html | 1 - .../qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html | 1 - .../expected_output/qml-uicomponents-progressbar.html | 1 - .../generatedoutput/expected_output/qml-uicomponents-switch.html | 1 - .../generatedoutput/expected_output/qml-uicomponents-tabwidget.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/second.html | 1 - .../generatedoutput/expected_output/test-componentset-example.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html | 1 - .../qdoc/generatedoutput/expected_output/testqdoc-test-members.html | 1 - .../qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html | 1 - .../expected_output/testqdoc-testderived-members.html | 1 - .../qdoc/generatedoutput/expected_output/testqdoc-testderived.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html | 1 - tests/auto/qdoc/generatedoutput/expected_output/third.html | 1 - .../qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html | 1 - 26 files changed, 30 deletions(-) diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 794e39fe4..b38f55fd1 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -1830,11 +1830,6 @@ void HtmlGenerator::generateNavigationBar(const QString &title, const Node *node void HtmlGenerator::generateHeader(const QString &title, const Node *node, CodeMarker *marker) { -#ifndef QT_NO_TEXTCODEC - out() << QString("\n").arg(outputEncoding); -#else - out() << QString("\n"); -#endif out() << "\n"; out() << QString("\n").arg(naturalLanguage); out() << "\n"; diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/tests/auto/qdoc/generatedoutput/expected_output/first.html index 0a7f52a13..09e5b20bf 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/first.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/first.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html index 8600e0867..b0cdbc5d4 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html index 0d424fb73..bf90efe9f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html index da5398612..1b81c7a2e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html index 6f444482d..4fb32e5b6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html index 108bf6a37..22156b261 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html index c1739608c..8ae53fd22 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html index c20ce7d8f..040796626 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html index b15559210..2578e31f1 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html index a0599c34d..79d9c8974 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html index 30c48adf5..2b471e8cb 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html index d860f022e..ea1da5176 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html index e4febbfcf..e2f61f90c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html index 8598eec00..9309be8ab 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/second.html b/tests/auto/qdoc/generatedoutput/expected_output/second.html index c3d76d0f8..2b6694896 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/second.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/second.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html index 40c874a3c..144897f58 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html index fc05a8d14..604626ddb 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html index 3900ff8cb..0eec5d7f1 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html index 732300dd3..47039787c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html index c4fb4ad0a..73ed7f78a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html index f5adf249c..2bdfe0e24 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html index a5478fc66..5ba6b7979 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html index 94ef710fc..dc8dfd27a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/third.html b/tests/auto/qdoc/generatedoutput/expected_output/third.html index 93dc5a1c1..b538e4c6a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/third.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/third.html @@ -1,4 +1,3 @@ - diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html index 5aa475abc..c78ba005f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html @@ -1,4 +1,3 @@ - -- cgit v1.2.3