aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-21 15:15:01 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-21 15:42:15 +0200
commit85bb24c39df53ea61f59351a60f4284c32cb50ff (patch)
tree04b767579cd04af864bf5f0f01920847c3685e7e
parent465587ffbac4c7f7b8b6a2219661e42939cb15f3 (diff)
Add some missing enumerations and classes
Task-number: PYSIDE-487 Change-Id: Ic5d15d67b821eff5cb59727ce2d749e6aa848441 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml2
-rw-r--r--sources/pyside2/PySide2/QtCharts/typesystem_charts.xml4
-rw-r--r--sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt1
-rw-r--r--sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml1
-rw-r--r--sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml1
5 files changed, 8 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
index 1ab13d7d7..5176a4cba 100644
--- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
+++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
@@ -43,6 +43,7 @@
<typesystem package="PySide2.Qt3DRender">
<load-typesystem name="Qt3DCore/typesystem_3dcore.xml" generate="no"/>
<namespace-type name="Qt3DRender">
+ <enum-type name="API"/>
<object-type name="PropertyReaderInterface"/>
<object-type name="QAbstractFunctor"/>
<object-type name="QAbstractLight">
@@ -215,6 +216,7 @@
</object-type>
<object-type name="QShaderData"/>
<object-type name="QShaderProgram">
+ <enum-type name="Format"/>
<enum-type name="ShaderType"/>
<enum-type name="Status"/>
</object-type>
diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
index 967118cd9..8ab734704 100644
--- a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
+++ b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
@@ -257,7 +257,9 @@
</object-type>
<object-type name="QSplineSeries" since="5.7"/>
<object-type name="QStackedBarSeries" since="5.7"/>
- <object-type name="QValueAxis" since="5.7"/>
+ <object-type name="QValueAxis" since="5.7">
+ <enum-type name="TickType"/>
+ </object-type>
<object-type name="QVBarModelMapper" since="5.7"/>
<object-type name="QVBoxPlotModelMapper" since="5.7"/>
<object-type name="QVCandlestickModelMapper" since="5.7"/>
diff --git a/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt b/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt
index d8fd6674f..98553b6a0 100644
--- a/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt
@@ -14,6 +14,7 @@ ${QtRemoteObjects_GEN_DIR}/qremoteobjectregistryhost_wrapper.cpp
${QtRemoteObjects_GEN_DIR}/qremoteobjectreplica_wrapper.cpp
# ${QtRemoteObjects_GEN_DIR}/qtremoteobjects_wrapper.cpp
${QtRemoteObjects_GEN_DIR}/qremoteobjectsettingsstore_wrapper.cpp
+${QtRemoteObjects_GEN_DIR}/qremoteobjectsourcelocationinfo_wrapper.cpp
# module is always needed
${QtRemoteObjects_GEN_DIR}/qtremoteobjects_module_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml b/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml
index d8d54b4fb..b4f7ed13b 100644
--- a/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml
+++ b/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml
@@ -71,4 +71,5 @@
<!-- protected: <enum-type name="ConstructorType"/> -->
</object-type>
<object-type name="QRemoteObjectSettingsStore"/>
+ <value-type name="QRemoteObjectSourceLocationInfo"/>
</typesystem>
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
index b18d4359a..2519101d7 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
@@ -64,6 +64,7 @@
<value-type name="QWebEngineHistoryItem"/>
<object-type name="QWebEnginePage">
+ <enum-type name="LifecycleState"/>
<enum-type name="WebAction"/>
<enum-type name="FindFlag" flags="FindFlags"/>
<enum-type name="WebWindowType"/>