diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-11-11 10:50:28 +0000 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2022-11-14 08:24:49 +0000 |
| commit | 1b371d1dafab9e0e348cf9141ef82301deadaf6e (patch) | |
| tree | a699e4df3fa375a28ef49569f28c95cfde306b7c /tests | |
| parent | db10efbc42c3e3e553ce3845eb29170e1272ce0e (diff) | |
| download | qttools-1b371d1dafab9e0e348cf9141ef82301deadaf6e.tar.gz | |
Revert "qdoc: Remove duplicate .qhp keyword entries for QML types"
This reverts commit 1efd6fe7403fe6873c81a0f418112fc205a76cb5.
Reason for revert: This patch removed the QML.<type> identifier, which
is used by Qt Creator so far.
Pick-to: 6.4 6.2
Change-Id: If96ac1b773a6191c214db4e75c74d5f23bc69c92
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/test.qhp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp index ac975186c..e058b6d82 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp +++ b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp @@ -63,21 +63,27 @@ </section> </toc> <keywords> - <keyword name="AbstractParent" id="QML.QDoc.Test.AbstractParent" ref="qml-qdoc-test-abstractparent.html"/> + <keyword name="AbstractParent" id="QML.AbstractParent" ref="qml-qdoc-test-abstractparent.html"/> + <keyword name="AbstractParent" id="QML.QDoc.Test1.AbstractParent" ref="qml-qdoc-test-abstractparent.html"/> <keyword name="Autolinking" id="Autolinking" ref="autolinking.html"/> - <keyword name="Child" id="QML.QDoc.Test.Child" ref="qml-qdoc-test-child.html"/> + <keyword name="Child" id="QML.Child" ref="qml-qdoc-test-child.html"/> + <keyword name="Child" id="QML.QDoc.Test1.Child" ref="qml-qdoc-test-child.html"/> <keyword name="CrossModuleRef" id="CrossModuleRef" ref="crossmoduleref.html"/> - <keyword name="DocTest" id="QML.QDoc.Test.DocTest" ref="qml-qdoc-test-doctest.html"/> + <keyword name="DocTest" id="QML.DocTest" ref="qml-qdoc-test-doctest.html"/> + <keyword name="DocTest" id="QML.QDoc.Test1.DocTest" ref="qml-qdoc-test-doctest.html"/> <keyword name="No QML Types Here" id="No QML Types Here" ref="test-empty-qmlmodule.html"/> <keyword name="Obsolete Classes" id="Obsolete Classes" ref="obsolete-classes.html"/> - <keyword name="ProgressBar" id="QML.UIComponents.ProgressBar" ref="qml-uicomponents-progressbar.html"/> + <keyword name="ProgressBar" id="QML.ProgressBar" ref="qml-uicomponents-progressbar.html"/> + <keyword name="ProgressBar" id="QML.UIComponents1.ProgressBar" ref="qml-uicomponents-progressbar.html"/> <keyword name="QDOCTEST_MACRO" id="QDOCTEST_MACRO" ref="testqdoc.html#QDOCTEST_MACRO"/> <keyword name="QDOCTEST_MACRO2" id="QDOCTEST_MACRO2" ref="testqdoc-test.html#QDOCTEST_MACRO2"/> <keyword name="QDoc Test C++ Classes" id="QDoc Test C++ Classes" ref="testcpp-module.html"/> <keyword name="QDoc.Test QML Module" id="QDoc.Test QML Module" ref="qdoc-test-qmlmodule.html"/> <keyword name="QML Modules" id="QML Modules" ref="qmlmodules.html"/> - <keyword name="Switch" id="QML.UIComponents.Switch" ref="qml-uicomponents-switch.html"/> - <keyword name="TabWidget" id="QML.UIComponents.TabWidget" ref="qml-uicomponents-tabwidget.html"/> + <keyword name="Switch" id="QML.Switch" ref="qml-uicomponents-switch.html"/> + <keyword name="Switch" id="QML.UIComponents1.Switch" ref="qml-uicomponents-switch.html"/> + <keyword name="TabWidget" id="QML.TabWidget" ref="qml-uicomponents-tabwidget.html"/> + <keyword name="TabWidget" id="QML.UIComponents1.TabWidget" ref="qml-uicomponents-tabwidget.html"/> <keyword name="Test" id="TestQDoc::Test" ref="testqdoc-test.html"/> <keyword name="Test C++ Types" id="Test C++ Types" ref="cpptypes.html"/> <keyword name="Test::SomeType" id="Test::SomeType" ref="testqdoc-test.html#SomeType-typedef"/> @@ -85,11 +91,14 @@ <keyword name="TestDerived::DerivedType" id="TestDerived::DerivedType" ref="testqdoc-testderived.html#DerivedType-typedef"/> <keyword name="TestDerived::NotTypedef" id="TestDerived::NotTypedef" ref="testqdoc-testderived.html#NotTypedef-typedef"/> <keyword name="TestQDoc" id="TestQDoc" ref="testqdoc.html"/> - <keyword name="Type" id="QML.QDoc.Test.Type" ref="qml-qdoc-test-type.html"/> + <keyword name="Type" id="QML.Type" ref="qml-qdoc-test-type.html"/> + <keyword name="Type" id="QML.QDoc.Test1.Type" ref="qml-qdoc-test-type.html"/> + <keyword name="TypeNoVersion" id="QML.TypeNoVersion" ref="qml-test-nover-typenoversion.html"/> <keyword name="TypeNoVersion" id="QML.Test.NoVer.TypeNoVersion" ref="qml-test-nover-typenoversion.html"/> <keyword name="UI Components" id="UI Components" ref="uicomponents-qmlmodule.html"/> <keyword name="Versionless QML Module" id="Versionless QML Module" ref="test-nover-qmlmodule.html"/> - <keyword name="YetAnotherChild" id="QML.QDoc.Test.YetAnotherChild" ref="qml-qdoc-test-yetanotherchild.html"/> + <keyword name="YetAnotherChild" id="QML.YetAnotherChild" ref="qml-qdoc-test-yetanotherchild.html"/> + <keyword name="YetAnotherChild" id="QML.QDoc.Test1.YetAnotherChild" ref="qml-qdoc-test-yetanotherchild.html"/> <keyword name="abs" id="int::abs" ref="qml-int.html#abs-method"/> <keyword name="active" id="DocTest::active" ref="qml-qdoc-test-doctest.html#active-prop"/> <keyword name="anotherObsoleteMember" id="Test::anotherObsoleteMember" ref="testqdoc-test-obsolete.html#anotherObsoleteMember"/> |