diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 10:55:34 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 10:55:34 +0200 |
| commit | 0e3a58441644faa14698a44f2ed682150430529a (patch) | |
| tree | de19c693a802abf6f020867f6ca8e912b0d019c6 /sources/pyside2/doc | |
| parent | 82934bc00c2de7ea51fd7e95601472fcdf7b6aea (diff) | |
| parent | b57f329ecbf1fd0b29ae0e8284c885adc0eb4ed3 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7b4ff138799ee81940c36e68a105cb42bb38a3ff
Diffstat (limited to 'sources/pyside2/doc')
6 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside2/doc/quickstart.rst b/sources/pyside2/doc/quickstart.rst index 5d8ddfe2d..b6a3dbbb3 100644 --- a/sources/pyside2/doc/quickstart.rst +++ b/sources/pyside2/doc/quickstart.rst @@ -9,7 +9,7 @@ Before you can install |project|, first you must install the following software: * Python 2.7 or 3.5+, * We recommend using a virtual environment, such as `venv <https://docs.python.org/3/library/venv.html>`_ or - `virtualenv <https://virtualenv.pypa.io/en/stable/installation>`_ + `virtualenv <https://virtualenv.pypa.io/en/latest>`_ Installation ------------ diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py index 656609a55..d97db65aa 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py @@ -38,7 +38,7 @@ ## ############################################################################# -from PySide2.QtCore import Slot, qApp +from PySide2.QtCore import Slot from PySide2.QtGui import QAction, QKeySequence from PySide2.QtWidgets import QMainWindow diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py index 2157b7b15..db9517f42 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py @@ -38,7 +38,7 @@ ## ############################################################################# -from PySide2.QtCore import Slot, qApp +from PySide2.QtCore import Slot from PySide2.QtGui import QAction, QKeySequence from PySide2.QtWidgets import QMainWindow diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py index 30d6582ba..e8979ab25 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py @@ -38,7 +38,7 @@ ## ############################################################################# -from PySide2.QtCore import Slot, qApp +from PySide2.QtCore import Slot from PySide2.QtGui import QAction, QKeySequence from PySide2.QtWidgets import QMainWindow diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py index 9e9ea8472..ef4e06f41 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py @@ -38,7 +38,7 @@ ## ############################################################################# -from PySide2.QtCore import Slot, qApp +from PySide2.QtCore import Slot from PySide2.QtGui import QAction, QKeySequence from PySide2.QtWidgets import QMainWindow diff --git a/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py b/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py index 8b0c7a6ad..792bcab51 100644 --- a/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py +++ b/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py @@ -41,7 +41,7 @@ from __future__ import print_function, absolute_import from PySide2.QtGui import QAction -from PySide2.QtWidgets import (QAbstractItemView, qApp, QDataWidgetMapper, +from PySide2.QtWidgets import (QAbstractItemView, QDataWidgetMapper, QHeaderView, QMainWindow, QMessageBox) from PySide2.QtGui import QKeySequence from PySide2.QtSql import (QSqlRelation, QSqlRelationalTableModel, QSqlTableModel, |