aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-03-20 09:49:01 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-04-07 11:58:07 +0200
commitb4d937deb29b18f881de099d3f60401e5d7f002a (patch)
tree83696a203f4774eb908eec5a25488a56d3c7177b
parent00dd9150030760544e17563eba2b2dc61ab55541 (diff)
Add struct QHelpLink
QHelpLink was added as an API review result by qttools/6c28b30cacc72959b8efdb4644b3d2bde2dd86f9. Amends bf14a84a7f658a37e8b246852f15e3b9969a2bad. Task-number: PYSIDE-487 Change-Id: I7f2e139655f56261e26c541a2c39834f51050dfa Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside2/PySide2/QtHelp/CMakeLists.txt3
-rw-r--r--sources/pyside2/PySide2/QtHelp/typesystem_help.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt
index 9838fbb7f..f0f53d259 100644
--- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt
@@ -26,7 +26,8 @@ endif()
if (Qt5Help_VERSION VERSION_EQUAL 5.15.0 OR Qt5Help_VERSION VERSION_GREATER 5.15.0)
list(APPEND QtHelp_SRC
- ${QtHelp_GEN_DIR}/qhelpfiltersettingswidget_wrapper.cpp)
+ ${QtHelp_GEN_DIR}/qhelpfiltersettingswidget_wrapper.cpp
+ ${QtHelp_GEN_DIR}/qhelplink_wrapper.cpp)
endif()
diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml
index f150811cc..76013d1ac 100644
--- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml
+++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml
@@ -60,6 +60,7 @@
<object-type name="QHelpFilterSettingsWidget" since="5.15"/>
<object-type name="QHelpIndexModel"/>
<object-type name="QHelpIndexWidget"/>
+ <value-type name="QHelpLink" since="5.15"/>
<object-type name="QHelpSearchEngine"/>
<value-type name="QHelpSearchQuery">
<enum-type name="FieldName"/>