diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:34:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:42:35 +0100 |
| commit | 1704567d7ad0d21dd3b588af7aad40cd244c1799 (patch) | |
| tree | 932b42988e482f01125dcbf4d470e9a56107689a /sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | |
| parent | 1d77cd18510412242384c5b37a00efd5b6ce8a26 (diff) | |
| parent | c98ef56544cd54661b61529829caf6a799a1a94f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 23fb4857e..425dcd7b5 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -461,6 +461,7 @@ <enum-type name="SliderChange"/> </object-type> <object-type name="QActionGroup"> + <enum-type name="ExclusionPolicy" since="5.14"/> <modify-function signature="addAction(QAction*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2950,6 +2951,7 @@ <object-type name="QCommandLinkButton"/> <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast<QFileSystemModel*>(%1)"> <enum-type name="Roles"/> + <enum-type name="Option" flags="Options" since="5.14"/> <modify-function signature="setIconProvider(QFileIconProvider*)"> <modify-argument index="1"> <parent index="this" action="add"/> |