summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rosca <nowrep@gmail.com>2018-03-18 10:49:26 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-06-01 07:18:06 +0000
commit677bfb5924c263f8b637cf4aa191268fea2860b9 (patch)
treeeb08108f7c22fa946e0a52dccdae7326c5eba734
parent3ee0e4ef37516cf29cab6d3962311b2266365bab (diff)
Add missing API of QtWebEngineWidgets
Change-Id: Ifafae9a5eac1844bf9057bc5e1f912e287499aa7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt6
-rw-r--r--sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml25
2 files changed, 21 insertions, 10 deletions
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
index f04394de..e0648c49 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
@@ -8,9 +8,11 @@ ${QtWebEngineWidgets_GEN_DIR}/qwebenginehistoryitem_wrapper.cpp
${QtWebEngineWidgets_GEN_DIR}/qwebenginepage_wrapper.cpp
${QtWebEngineWidgets_GEN_DIR}/qwebengineprofile_wrapper.cpp
${QtWebEngineWidgets_GEN_DIR}/qwebenginescript_wrapper.cpp
-#${QtWebEngineWidgets_GEN_DIR}/qwebenginescriptcollection_wrapper.cpp
-#${QtWebEngineWidgets_GEN_DIR}/qwebenginesettings_wrapper.cpp
+${QtWebEngineWidgets_GEN_DIR}/qwebenginescriptcollection_wrapper.cpp
+${QtWebEngineWidgets_GEN_DIR}/qwebenginesettings_wrapper.cpp
${QtWebEngineWidgets_GEN_DIR}/qwebengineview_wrapper.cpp
+${QtWebEngineWidgets_GEN_DIR}/qwebenginecontextmenudata_wrapper.cpp
+${QtWebEngineWidgets_GEN_DIR}/qwebenginefullscreenrequest_wrapper.cpp
# module is always needed
${QtWebEngineWidgets_GEN_DIR}/qtwebenginewidgets_module_wrapper.cpp
)
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
index addbf222..6e741842 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
@@ -53,6 +53,7 @@
</object-type>
<object-type name="QWebEngineDownloadItem">
+ <enum-type name="DownloadInterruptReason"/>
<enum-type name="DownloadState" />
<enum-type name="SavePageFormat"/>
</object-type>
@@ -71,6 +72,7 @@
<enum-type name="Feature" />
<enum-type name="FileSelectionMode" />
<enum-type name="JavaScriptConsoleMessageLevel" />
+ <enum-type name="RenderProcessTerminationStatus"/>
</object-type>
<object-type name="QWebEngineProfile">
@@ -83,16 +85,23 @@
<enum-type name="ScriptWorldId" />
</value-type>
- <!-- TODO: Deal with private constructor
- <value-type name="QWebEngineScriptCollection" /> -->
+ <object-type name="QWebEngineScriptCollection"/>
- <!-- TODO: Deal with private constructor
- <value-type name="QWebEngineSettings">
- <enum-type name="FontFamily" />
- <enum-type name="WebAttribute" />
- <enum-type name="FontSize" />
- </value-type> -->
+ <object-type name="QWebEngineSettings">
+ <enum-type name="FontFamily"/>
+ <enum-type name="FontSize"/>
+ <enum-type name="UnknownUrlSchemePolicy" since="5.11"/>
+ <enum-type name="WebAttribute"/>
+ </object-type>
<object-type name="QWebEngineView" />
+ <value-type name="QWebEngineContextMenuData">
+ <enum-type name="EditFlag" flags="EditFlags" since="5.11"/>
+ <enum-type name="MediaFlag" flags="MediaFlags" since="5.11"/>
+ <enum-type name="MediaType"/>
+ </value-type>
+
+ <object-type name="QWebEngineFullScreenRequest"/>
+
</typesystem>