From 82c44b81dc414ca8f6093bdd0379c93b95d2d610 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Sun, 5 Jan 2020 09:49:01 +0100 Subject: QDoc: Use html5 charset declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As we claim the html is html5 compliant (), use the html5 charset declaration instead of html 4.01 style. Also, drop the trailing '/' (no need to close meta element). Update all test content to match the new output. Task-number: QTBUG-73026 Change-Id: I4cf58a342a2bfb9e76245bd3fb91525e6e59f622 Reviewed-by: Topi Reiniö --- src/qdoc/htmlgenerator.cpp | 2 +- tests/auto/qdoc/generatedoutput/expected_output/first.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/index.html | 2 +- .../auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html | 2 +- .../expected_output/qdoctests-qdocfileoutput-linking.html | 2 +- .../qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/qml-int.html | 2 +- .../generatedoutput/expected_output/qml-qdoc-test-abstractparent.html | 2 +- .../auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html | 2 +- .../qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html | 2 +- .../generatedoutput/expected_output/qml-qdoc-test-type-members.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html | 2 +- .../generatedoutput/expected_output/qml-uicomponents-progressbar.html | 2 +- .../qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html | 2 +- .../generatedoutput/expected_output/qml-uicomponents-tabwidget.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/second.html | 2 +- .../qdoc/generatedoutput/expected_output/test-componentset-example.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html | 2 +- .../qdoc/generatedoutput/expected_output/testqdoc-test-members.html | 2 +- .../qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html | 2 +- .../generatedoutput/expected_output/testqdoc-testderived-members.html | 2 +- .../auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html | 2 +- tests/auto/qdoc/generatedoutput/expected_output/third.html | 2 +- .../qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index b38f55fd1..b7dc227ca 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -1833,7 +1833,7 @@ void HtmlGenerator::generateHeader(const QString &title, const Node *node, CodeM out() << "\n"; out() << QString("\n").arg(naturalLanguage); out() << "\n"; - out() << " \n"; + out() << " \n"; if (node && !node->doc().location().isEmpty()) out() << "\n"; diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/tests/auto/qdoc/generatedoutput/expected_output/first.html index 09e5b20bf..1e92e7067 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/first.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/first.html @@ -1,7 +1,7 @@ - + First Class | TestModule diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html index b0cdbc5d4..cb5b7b6db 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html @@ -1,7 +1,7 @@ - + doc index | TestModule 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 bf90efe9f..6a513e987 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html @@ -1,7 +1,7 @@ - + Test 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 1b81c7a2e..74b47375e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html @@ -1,7 +1,7 @@ - + Testing QDoc's link command | Test diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html index 4fb32e5b6..c4975e349 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html @@ -1,7 +1,7 @@ - + Testing QDoc output from .qdoc files | Test diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html index 22156b261..651f840cb 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html @@ -1,7 +1,7 @@ - + int QML Basic Type | Test 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 8ae53fd22..949dc7868 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,7 +1,7 @@ - + AbstractParent QML Type | Test 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 040796626..5ba40c99c 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,7 +1,7 @@ - + Child QML Type | Test 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 2578e31f1..a88d935be 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,7 +1,7 @@ - + DocTest QML Type | Test 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 79d9c8974..91cfa8643 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,7 +1,7 @@ - + List of All Members for Type | Test 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 2b471e8cb..d4c278659 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,7 +1,7 @@ - + Type QML Type | Test 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 ea1da5176..6cfe36a83 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html @@ -1,7 +1,7 @@ - + ProgressBar QML Type | Test 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 e2f61f90c..5ebae4905 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html @@ -1,7 +1,7 @@ - + Switch QML Type | Test 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 9309be8ab..2c48e1ddd 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html @@ -1,7 +1,7 @@ - + TabWidget QML Type | Test diff --git a/tests/auto/qdoc/generatedoutput/expected_output/second.html b/tests/auto/qdoc/generatedoutput/expected_output/second.html index 2b6694896..04a4862cd 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/second.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/second.html @@ -1,7 +1,7 @@ - + Second Class | TestModule 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 144897f58..faf632bea 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html @@ -1,7 +1,7 @@ - + QML Documentation Example | Test diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html index 604626ddb..60bbd587c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -1,7 +1,7 @@ - + QDoc Test C++ Classes | TestCPP 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 0eec5d7f1..5554519af 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html @@ -1,7 +1,7 @@ - + List of All Members for Test | TestCPP 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 47039787c..ef0e7bcac 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html @@ -1,7 +1,7 @@ - + Obsolete Members for Test | TestCPP diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html index 73ed7f78a..f373f725a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -1,7 +1,7 @@ - + Test Class | TestCPP 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 2bdfe0e24..89b206b27 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html @@ -1,7 +1,7 @@ - + List of All Members for TestDerived | TestCPP diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html index 5ba6b7979..cafca0a8c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html @@ -1,7 +1,7 @@ - + TestDerived Class | TestCPP diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html index dc8dfd27a..a259e40af 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -1,7 +1,7 @@ - + TestQDoc Namespace | TestCPP diff --git a/tests/auto/qdoc/generatedoutput/expected_output/third.html b/tests/auto/qdoc/generatedoutput/expected_output/third.html index b538e4c6a..ee69a1689 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/third.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/third.html @@ -1,7 +1,7 @@ - + Third Class | TestModule diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html index c78ba005f..baba2c57a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html @@ -1,7 +1,7 @@ - + UI Components | Test -- cgit v1.2.3