diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 07:39:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 07:49:07 +0200 |
| commit | 9881b68c4c7bc1715cd266c41c63a3a918d83b07 (patch) | |
| tree | 5252e3e767e64d98383f6103d9d5941a206a52bc /sources/pyside2/doc | |
| parent | 17a20f95151368a3b92b949b905325865643ca45 (diff) | |
| parent | cad869b619fdc0969216e6e9b63fd1afb5edb7db (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7e4c7f9378706438715362b1e2da9a3cd2794562
Diffstat (limited to 'sources/pyside2/doc')
| -rw-r--r-- | sources/pyside2/doc/index.rst | 4 | ||||
| -rw-r--r-- | sources/pyside2/doc/tutorials/expenses/main_snake_prop.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sources/pyside2/doc/index.rst b/sources/pyside2/doc/index.rst index 72a26d19d..289a653f3 100644 --- a/sources/pyside2/doc/index.rst +++ b/sources/pyside2/doc/index.rst @@ -80,6 +80,10 @@ Documentation </tr> </table> +We have also a `wiki page`_ where you can find how to report bugs, contribute or contact the community. + +.. _`wiki page`: https://wiki.qt.io/Qt_for_Python + .. toctree:: :hidden: :glob: 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")) |