diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtHelp')
| -rw-r--r-- | sources/pyside6/PySide6/QtHelp/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtHelp/typesystem_help.xml | 16 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sources/pyside6/PySide6/QtHelp/CMakeLists.txt b/sources/pyside6/PySide6/QtHelp/CMakeLists.txt index 1b1f1ad74..7bf46dcef 100644 --- a/sources/pyside6/PySide6/QtHelp/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtHelp/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtHelp) set(QtHelp_SRC @@ -5,6 +8,7 @@ ${QtHelp_GEN_DIR}/qcompressedhelpinfo_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpcontentitem_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpcontentmodel_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpcontentwidget_wrapper.cpp +${QtHelp_GEN_DIR}/qhelpglobal_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpengine_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpenginecore_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpfilterdata_wrapper.cpp @@ -37,9 +41,6 @@ set(QtHelp_include_dirs ${QtHelp_SOURCE_DIR} ${QtCore_GEN_DIR} ) set(QtHelp_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} ${Qt${QT_MAJOR_VERSION}Help_LIBRARIES}) set(QtHelp_deps QtWidgets) diff --git a/sources/pyside6/PySide6/QtHelp/typesystem_help.xml b/sources/pyside6/PySide6/QtHelp/typesystem_help.xml index 6af0247cc..5fa30e034 100644 --- a/sources/pyside6/PySide6/QtHelp/typesystem_help.xml +++ b/sources/pyside6/PySide6/QtHelp/typesystem_help.xml @@ -4,10 +4,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only --> -<typesystem package="PySide6.QtHelp"> +<typesystem package="PySide6.QtHelp" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - <value-type name="QCompressedHelpInfo" since="5.13"/> + <value-type name="QCompressedHelpInfo"/> <value-type name="QHelpContentItem"> <modify-function signature="parent()const"> <modify-argument index="return"> @@ -15,16 +16,17 @@ </modify-argument> </modify-function> </value-type> - <object-type name="QHelpContentModel" polymorphic-id-expression="qobject_cast<QHelpContentModel*>(%1)"/> + <object-type name="QHelpContentModel" polymorphic-id-expression="qobject_cast<QHelpContentModel*>(%B)"/> <object-type name="QHelpContentWidget"/> + <value-type name="QHelpGlobal"/> <object-type name="QHelpEngine"/> <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"/> + <value-type name="QHelpFilterData"/> + <object-type name="QHelpFilterEngine"/> + <object-type name="QHelpFilterSettingsWidget"/> <object-type name="QHelpIndexModel"/> <object-type name="QHelpIndexWidget"/> - <value-type name="QHelpLink" since="5.15"/> + <value-type name="QHelpLink"/> <object-type name="QHelpSearchEngine"/> <value-type name="QHelpSearchQuery"> <enum-type name="FieldName"/> |