diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 10:55:34 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 10:55:34 +0200 |
| commit | 0e3a58441644faa14698a44f2ed682150430529a (patch) | |
| tree | de19c693a802abf6f020867f6ca8e912b0d019c6 /sources/pyside2/PySide2 | |
| parent | 82934bc00c2de7ea51fd7e95601472fcdf7b6aea (diff) | |
| parent | b57f329ecbf1fd0b29ae0e8284c885adc0eb4ed3 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7b4ff138799ee81940c36e68a105cb42bb38a3ff
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt index f0fb1eeda..52a071606 100644 --- a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt @@ -21,14 +21,17 @@ set(QtWebEngineCore_include_dirs ${QtWebEngineCore_SOURCE_DIR} ${QtWebEngineCore_BINARY_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} ${libpyside_SOURCE_DIR} ${QtCore_GEN_DIR} + ${QtNetwork_GEN_DIR} ) set(QtWebEngineCore_libraries pyside2 ${Qt${QT_MAJOR_VERSION}WebEngineCore_LIBRARIES} ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} + ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} ) -set(QtWebEngineCore_deps QtCore) +set(QtWebEngineCore_deps QtCore QtNetwork) create_pyside_module(NAME QtWebEngineCore INCLUDE_DIRS QtWebEngineCore_include_dirs LIBRARIES QtWebEngineCore_libraries diff --git a/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml index eb1ab3d61..65c0e8137 100644 --- a/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml +++ b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml @@ -41,6 +41,7 @@ --> <typesystem package="PySide2.QtWebEngineCore"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <object-type name="QWebEngineCookieStore"/> |