diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-20 15:23:36 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-21 09:50:06 +0000 |
| commit | c013faebdfb248e1ce66fa41aa0a771aaf4e3d80 (patch) | |
| tree | 7b27e8b1b9a85c26514c488a7fa4cc1d23982ad0 /sources/pyside2 | |
| parent | d248f7e81bf6db90a03e8bca7059e81e3e37158c (diff) | |
PySide2: Add QWebEngineUrlScheme for 5.12
Change-Id: I72ae6d0af284dc85e9f36faafd9b9d3bf27c7962
Fixes: PYSIDE-878
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt index fe660aa7b..93ff6f5cc 100644 --- a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt @@ -11,6 +11,11 @@ ${QtWebEngineCore_GEN_DIR}/qwebengineurlschemehandler_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qtwebenginecore_module_wrapper.cpp ) +if (Qt5WebEngineCore_VERSION VERSION_EQUAL 5.12.0 OR Qt5WebEngineCore_VERSION VERSION_GREATER 5.12.0) + list(APPEND QtWebEngineCore_SRC + ${QtWebEngineCore_GEN_DIR}/qwebengineurlscheme_wrapper.cpp) +endif() + set(QtWebEngineCore_include_dirs ${QtWebEngineCore_SOURCE_DIR} ${QtWebEngineCore_BINARY_DIR} diff --git a/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml index e6faee9d9..67399b54f 100644 --- a/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml +++ b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml @@ -63,6 +63,11 @@ <object-type name="QWebEngineUrlRequestJob"> <enum-type name="Error"/> </object-type> + <value-type name="QWebEngineUrlScheme" since="5.12"> + <enum-type name="Syntax"/> + <enum-type name="SpecialPort"/> + <enum-type name="Flag" flags="Flags"/> + </value-type> <object-type name="QWebEngineUrlSchemeHandler"/> |