diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-16 08:00:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-16 08:00:32 +0200 |
| commit | 53181fb95d3884cc067d005f37accd92d128bccc (patch) | |
| tree | 6b21bd8e6bdd3b80e21590219331d41f71975df1 /sources/pyside2/PySide2 | |
| parent | 2b0ea8856212b0320238f1c14091a1396039c0a4 (diff) | |
| parent | 1d50a0a9f6691b2081e389bafa1f22d2fb6004ed (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I114a003e36bbe9eb7452f13c1515e3419648e228
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml index a331b6988..03977fcbf 100644 --- a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml +++ b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml @@ -54,12 +54,16 @@ <object-type name="QAxScript"> <enum-type name="FunctionFlags"/> </object-type> - <object-type name="QAxScriptEngine"/> + <object-type name="QAxScriptEngine"> + <enum-type name="State"/> + </object-type> <object-type name="QAxScriptManager"> <!-- Ax Servers only --> <modify-function signature="addObject(QObject*)" remove="all"/> </object-type> - <object-type name="QAxSelect"/> <object-type name="QAxBaseWidget"/> + <object-type name="QAxSelect"> + <enum-type name="SandboxingLevel"/> + </object-type> <object-type name="QAxWidget"/> </typesystem> |