aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml3
-rw-r--r--sources/pyside2/doc/tutorials/expenses/main_snake_prop.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 0ca1882d8..155591b0c 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -1258,7 +1258,8 @@
<object-type name="QLayout">
<inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/>
-
+ <!-- Becomes a real Q_OPROPERTY in Qt 6 -->
+ <property name="contentsMargins" type="QMargins" get="contentsMargins" set="setContentsMargins"/>
<enum-type name="SizeConstraint"/>
<modify-function signature="itemAt(int)const">
diff --git a/sources/pyside2/doc/tutorials/expenses/main_snake_prop.py b/sources/pyside2/doc/tutorials/expenses/main_snake_prop.py
index 4421980c5..f4382e711 100644
--- a/sources/pyside2/doc/tutorials/expenses/main_snake_prop.py
+++ b/sources/pyside2/doc/tutorials/expenses/main_snake_prop.py
@@ -39,7 +39,7 @@
#############################################################################
import sys
-from PySide2.QtCore import Qt, Slot, QSize
+from PySide2.QtCore import QMargins, Qt, Slot, QSize
from PySide2.QtGui import QPainter
from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit,
QMainWindow, QPushButton, QTableWidget, QTableWidgetItem,
@@ -81,7 +81,8 @@ class Widget(QWidget):
self.add.enabled = False
self.right = QVBoxLayout()
- self.right.margin = 10
+
+ self.right.contents_margins = QMargins(10, 10, 10, 10)
self.right.add_widget(QLabel("Description"))
self.right.add_widget(self.description)
self.right.add_widget(QLabel("Price"))