diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2022-11-18 22:16:51 +0000 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2022-11-27 23:40:49 +0000 |
| commit | 4106772b57723a8315d5e540305862ed40248594 (patch) | |
| tree | 08ff89ef9b78d79cce9bd0a2cf27af0605df53c6 /tests | |
| parent | 2e204df17a7b5dd50b6f1ec33ec1bf218824ef3c (diff) | |
| download | qttools-4106772b57723a8315d5e540305862ed40248594.tar.gz | |
qdoc: Fix keyword generated for QML modules in the .qhp
Replace a generic keyword that uses a QML module node \title with
a keyword that represents the actual QML module import:
QtQuick -> QML.QtQuick
QtQuick.Controls -> QML.Controls.QtQuick
Pick-to: 6.4
Fixes: QTBUG-105075
Change-Id: I78d05e9336dd9147e112fb99b1558fa7e07610c5
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/test.qhp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp index e058b6d82..484e167ce 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp +++ b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp @@ -71,14 +71,13 @@ <keyword name="CrossModuleRef" id="CrossModuleRef" ref="crossmoduleref.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.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="QDoc.Test" id="QML.Test.QDoc" ref="qdoc-test-qmlmodule.html"/> <keyword name="QML Modules" id="QML Modules" ref="qmlmodules.html"/> <keyword name="Switch" id="QML.Switch" ref="qml-uicomponents-switch.html"/> <keyword name="Switch" id="QML.UIComponents1.Switch" ref="qml-uicomponents-switch.html"/> @@ -86,6 +85,8 @@ <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.Empty" id="QML.Empty.Test" ref="test-empty-qmlmodule.html"/> + <keyword name="Test.NoVer" id="QML.NoVer.Test" ref="test-nover-qmlmodule.html"/> <keyword name="Test::SomeType" id="Test::SomeType" ref="testqdoc-test.html#SomeType-typedef"/> <keyword name="TestDerived" id="TestQDoc::TestDerived" ref="testqdoc-testderived.html"/> <keyword name="TestDerived::DerivedType" id="TestDerived::DerivedType" ref="testqdoc-testderived.html#DerivedType-typedef"/> @@ -95,8 +96,7 @@ <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="UIComponents" id="QML.UIComponents" ref="uicomponents-qmlmodule.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"/> |