diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-22 15:09:15 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-16 12:43:31 +0100 |
| commit | bf14a84a7f658a37e8b246852f15e3b9969a2bad (patch) | |
| tree | 78fe212d0628395678e52d18541c05d9c0e34fce /sources/pyside2/PySide2/QtHelp | |
| parent | b1acc70c26126c7560ff450d5129dee9a6514987 (diff) | |
Add API of Qt 5.15
Task-number: PYSIDE-487
Change-Id: I4ebd62a5d81b308a189b8f4b06c1523fa78b5ef0
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/PySide2/QtHelp')
| -rw-r--r-- | sources/pyside2/PySide2/QtHelp/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtHelp/typesystem_help.xml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt index 4262bcd1a..9838fbb7f 100644 --- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt @@ -24,6 +24,12 @@ if (Qt5Help_VERSION VERSION_EQUAL 5.13.0 OR Qt5Help_VERSION VERSION_GREATER 5.13 ${QtHelp_GEN_DIR}/qhelpfilterengine_wrapper.cpp) 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) +endif() + + set(QtHelp_include_dirs ${QtHelp_SOURCE_DIR} ${QtHelp_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml index cd62f8afd..f150811cc 100644 --- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml +++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml @@ -57,6 +57,7 @@ <object-type name="QHelpEngineCore"/> <value-type name="QHelpFilterData" since="5.13"/> <object-type name="QHelpFilterEngine" since="5.13"/> + <object-type name="QHelpFilterSettingsWidget" since="5.15"/> <object-type name="QHelpIndexModel"/> <object-type name="QHelpIndexWidget"/> <object-type name="QHelpSearchEngine"/> |