diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-31 13:40:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-01 05:32:25 +0000 |
| commit | 7ac8da6adee7528578ec800bf810ea69ac746043 (patch) | |
| tree | dd2a1d6eadd0f70edccb5b68ce495759e80ff350 /sources/pyside2/PySide2/QtWidgets | |
| parent | 404f584d6ac4b94c65d60aa1171f0ef1fe4dc6bd (diff) | |
Adapt to recent Qt 6 changes
- Removal of the statemachine framework from QtCore
- Addition of QAbstractFileIconProvider
- Adapt some signatures
- QMetaType deprecations
Change-Id: Ia51354542ad1d2f0bb5530e45ebef0d6ccdb633d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtWidgets')
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt index 5383d9410..3df3b8d19 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -88,7 +88,6 @@ ${QtWidgets_GEN_DIR}/qinputdialog_wrapper.cpp ${QtWidgets_GEN_DIR}/qitemdelegate_wrapper.cpp ${QtWidgets_GEN_DIR}/qitemeditorcreatorbase_wrapper.cpp ${QtWidgets_GEN_DIR}/qitemeditorfactory_wrapper.cpp -${QtWidgets_GEN_DIR}/qkeyeventtransition_wrapper.cpp ${QtWidgets_GEN_DIR}/qkeysequenceedit_wrapper.cpp ${QtWidgets_GEN_DIR}/qlabel_wrapper.cpp ${QtWidgets_GEN_DIR}/qlayout_wrapper.cpp @@ -104,7 +103,6 @@ ${QtWidgets_GEN_DIR}/qmdisubwindow_wrapper.cpp ${QtWidgets_GEN_DIR}/qmenu_wrapper.cpp ${QtWidgets_GEN_DIR}/qmenubar_wrapper.cpp ${QtWidgets_GEN_DIR}/qmessagebox_wrapper.cpp -${QtWidgets_GEN_DIR}/qmouseeventtransition_wrapper.cpp ${QtWidgets_GEN_DIR}/qpangesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qpinchgesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qplaintextdocumentlayout_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 79b824d5e..512f540f4 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -426,11 +426,6 @@ <reference-count action="set"/> </modify-argument> </modify-function> - <modify-function signature="viewOptions()const"> - <modify-argument index="return"> - <replace-default-expression with="QStyleOptionViewItem()"/> - </modify-argument> - </modify-function> <modify-function signature="model()const"> <modify-argument index="return"> <!-- Defining ownership as "default" avoids the object to be automatically @@ -512,10 +507,7 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QFileIconProvider"> - <enum-type name="IconType"/> - <enum-type name="Option" flags="Options"/> - </object-type> + <object-type name="QFileIconProvider"/> <object-type name="QWizard"> <enum-type name="WizardButton"/> <enum-type name="WizardOption" flags="WizardOptions"/> @@ -2324,7 +2316,7 @@ <include file-name="QUrl" location="global"/> <include file-name="QAbstractProxyModel" location="global"/> </extra-includes> - <modify-function signature="setIconProvider(QFileIconProvider*)"> + <modify-function signature="setIconProvider(QAbstractFileIconProvider*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2838,7 +2830,7 @@ <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-function signature="setIconProvider(QAbstractFileIconProvider*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -3269,8 +3261,6 @@ <object-type name="QGraphicsRotation" since="4.6"/> <object-type name="QGraphicsScale" since="4.6"/> <object-type name="QGraphicsTransform" since="4.6"/> - <object-type name="QKeyEventTransition" since="4.6"/> - <object-type name="QMouseEventTransition" since="4.6"/> <object-type name="QPanGesture" since="4.6"/> <object-type name="QPinchGesture" since="4.6"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> |