diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-21 09:59:45 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-21 09:29:43 +0000 |
| commit | fb9666f093f09737a0b9b328513d3e468a8b22f8 (patch) | |
| tree | eb13a99323b7d7656e1f6264e95e1de9557e88f9 | |
| parent | 7e16987d3a0369688dfea1e3d98efdb3e00c7b9c (diff) | |
Fix some QPixmap-related issues
- static QPixmap *find(QString); has been removed; add a function
similar to the overload taking a QPixmapCache::Key.
- QPixmap *QLabel::pixmap() has been changed to return
QPixmap by value which should no longer require modification.
Remove the overloads taking the helper enumeration.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I17a229fef2bc0604c9c7272942a4947e34803957
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 3 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 6d704290d..563676baa 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -1155,6 +1155,9 @@ <add-function signature="find(QPixmapCache::Key&)"> <inject-code file="../glue/qtgui.cpp" snippet="qpixmapcache-find"/> </add-function> + <add-function signature="find(const QString&)"> + <inject-code file="../glue/qtgui.cpp" snippet="qpixmapcache-find"/> + </add-function> </object-type> <object-type name="QRegularExpressionValidator"/> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 160082d07..79b824d5e 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -2305,13 +2305,8 @@ </modify-argument> </modify-function> - <modify-function signature="pixmap()const"> - <modify-argument index="return"> - <!-- Defining ownership as "default" avoids the object to be automatically - set as parent of the returned pointer. --> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> + <modify-function signature="pixmap(Qt::ReturnByValueConstant)const" remove="all"/> + <modify-function signature="picture(Qt::ReturnByValueConstant)const" remove="all"/> <modify-function signature="setMovie(QMovie *)"> <modify-argument index="1"> <parent index="this" action="add"/> |