diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-20 14:04:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-21 09:20:06 +0200 |
| commit | dc01ae87dcbb84837238aa5b2ca2430271f4534f (patch) | |
| tree | d33cef71b6887778eb54a6f626bd33825ad53d26 | |
| parent | 69d43ea814788a18e8d77920d493fd84f6fc699a (diff) | |
Add QWebEnginePage::setWebChannel(QWebChannel*,quint32)
Make QtWebChannel a dependency of QtWebEngineCore to expose
the method.
Fixes: PYSIDE-1663
Change-Id: I5b70976f68c1b863582897a648ec7446af9f982b
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
3 files changed, 15 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt index 7cb709d27..f6a3fb35c 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt @@ -38,12 +38,14 @@ set(QtWebEngineCore_include_dirs ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}PrintSupport_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}WebChannel_INCLUDE_DIRS} ${libpyside_SOURCE_DIR} ${QtCore_GEN_DIR} ${QtGui_GEN_DIR} ${QtWidgets_GEN_DIR} ${QtNetwork_GEN_DIR} ${QtPrintSupport_GEN_DIR} + ${QtWebChannel_GEN_DIR} ) set(QtWebEngineCore_libraries pyside6 ${Qt${QT_MAJOR_VERSION}WebEngineCore_LIBRARIES} @@ -52,8 +54,11 @@ set(QtWebEngineCore_libraries pyside6 ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} ${Qt${QT_MAJOR_VERSION}PrintSupport_LIBRARIES} + ${Qt${QT_MAJOR_VERSION}WebChannel_LIBRARIES} ) -set(QtWebEngineCore_deps QtCore QtGui QtNetwork QtPrintSupport) + +set(QtWebEngineCore_deps QtCore QtGui QtNetwork QtPrintSupport QtWebChannel) + create_pyside_module(NAME QtWebEngineCore INCLUDE_DIRS QtWebEngineCore_include_dirs LIBRARIES QtWebEngineCore_libraries diff --git a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml index 49f75a319..cee7602c5 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml +++ b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml @@ -44,6 +44,7 @@ <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <load-typesystem name="QtPrintSupport/typesystem_printsupport.xml" generate="no"/> + <load-typesystem name="QtWebChannel/typesystem_webchannel.xml" generate="no"/> <object-type name="QWebEngineCookieStore"/> diff --git a/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt index 04ee6174b..c43be68f1 100644 --- a/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt @@ -15,6 +15,7 @@ set(QtWebEngineWidgets_include_dirs ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}PrintSupport_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}WebEngineWidgets_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}WebChannel_INCLUDE_DIRS} ${libpyside_SOURCE_DIR} ${QtCore_GEN_DIR} ${QtGui_GEN_DIR} @@ -23,6 +24,7 @@ set(QtWebEngineWidgets_include_dirs ${QtNetwork_GEN_DIR} ${QtWebEngineCore_GEN_DIR} ${QtPrintSupport_GEN_DIR} + ${QtWebChannel_GEN_DIR} ) set(QtWebEngineWidgets_libraries pyside6 ${Qt${QT_MAJOR_VERSION}WebEngineWidgets_LIBRARIES} @@ -31,8 +33,11 @@ set(QtWebEngineWidgets_libraries pyside6 ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} ${Qt${QT_MAJOR_VERSION}PrintSupport_LIBRARIES} + ${Qt${QT_MAJOR_VERSION}WebChannel_LIBRARIES} ) -set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtPrintSupport QtWebEngineCore) + +set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtPrintSupport QtWebChannel QtWebEngineCore) + create_pyside_module(NAME QtWebEngineWidgets INCLUDE_DIRS QtWebEngineWidgets_include_dirs LIBRARIES QtWebEngineWidgets_libraries @@ -40,3 +45,5 @@ create_pyside_module(NAME QtWebEngineWidgets TYPESYSTEM_PATH QtWebEngineWidgets_SOURCE_DIR SOURCES QtWebEngineWidgets_SRC) + + |