From ceeb82693a0240b1dd4f51605ba21413927ee558 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 19 May 2020 11:55:10 +0200 Subject: Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6 Test failures: shiboken2:testmodifyfunction pyside2:QtCore::qbytearray_test pyside2:QtGui::bug_PYSIDE-41 pyside2:QtGui::deepcopy_test pyside2:QtGui::qfontmetrics_test pyside2:QtGui::qpixmapcache_test pyside2:QtWidgets::api2_test (QTBUG-85417) pyside2:QtWidgets::bug_632 pyside2:QtWidgets::bug_714 pyside2:QtWidgets::bug_785 pyside2:QtWidgets::qshortcut_test pyside2:QtQml::bug_825 pyside2:QtQml::bug_1029 pyside2:QtQml::registertype pyside2:QtQml::qqmlincubator_incubateWhile pyside2:QtQml::signal_arguments Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335 Reviewed-by: Christian Tismer --- .../doc/codesnippets/examples/mainwindows/application/mainwindow.h | 3 ++- .../pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py | 4 ++-- .../pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py | 4 ++-- .../pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py | 4 ++-- .../pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py | 4 ++-- sources/pyside2/doc/tutorials/expenses/main.py | 4 ++-- sources/pyside2/doc/tutorials/expenses/steps/02-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/03-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/04-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/05-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/06-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/07-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/08-expenses.py | 3 ++- sources/pyside2/doc/tutorials/expenses/steps/09-expenses.py | 4 ++-- sources/pyside2/doc/tutorials/expenses/steps/10-expenses.py | 4 ++-- sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py | 3 ++- 16 files changed, 32 insertions(+), 23 deletions(-) (limited to 'sources/pyside2/doc') diff --git a/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.h b/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.h index bdb7bcf22..d2cda4aa2 100644 --- a/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.h +++ b/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.h @@ -48,7 +48,8 @@ ** ****************************************************************************/ -from PySide2.QtWidgets import (QAction, QApplication, QMainWindow, QMenu, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QApplication, QMainWindow, QMenu, QPlainTextEdit, QSessionManager) diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py index 64f831e5d..656609a55 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize3/main_window.py @@ -39,8 +39,8 @@ ############################################################################# from PySide2.QtCore import Slot, qApp -from PySide2.QtGui import QKeySequence -from PySide2.QtWidgets import QMainWindow, QAction +from PySide2.QtGui import QAction, QKeySequence +from PySide2.QtWidgets import QMainWindow class MainWindow(QMainWindow): diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py index 9f7c6814f..2157b7b15 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize4/main_window.py @@ -39,8 +39,8 @@ ############################################################################# from PySide2.QtCore import Slot, qApp -from PySide2.QtGui import QKeySequence -from PySide2.QtWidgets import QMainWindow, QAction +from PySide2.QtGui import QAction, QKeySequence +from PySide2.QtWidgets import QMainWindow class MainWindow(QMainWindow): diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py index 4786365e8..30d6582ba 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_window.py @@ -39,8 +39,8 @@ ############################################################################# from PySide2.QtCore import Slot, qApp -from PySide2.QtGui import QKeySequence -from PySide2.QtWidgets import QMainWindow, QAction +from PySide2.QtGui import QAction, QKeySequence +from PySide2.QtWidgets import QMainWindow class MainWindow(QMainWindow): diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py index c223aa69b..9e9ea8472 100644 --- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py +++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize6/main_window.py @@ -39,8 +39,8 @@ ############################################################################# from PySide2.QtCore import Slot, qApp -from PySide2.QtGui import QKeySequence -from PySide2.QtWidgets import QMainWindow, QAction +from PySide2.QtGui import QAction, QKeySequence +from PySide2.QtWidgets import QMainWindow class MainWindow(QMainWindow): diff --git a/sources/pyside2/doc/tutorials/expenses/main.py b/sources/pyside2/doc/tutorials/expenses/main.py index 6cc911671..d927f126c 100644 --- a/sources/pyside2/doc/tutorials/expenses/main.py +++ b/sources/pyside2/doc/tutorials/expenses/main.py @@ -40,8 +40,8 @@ import sys from PySide2.QtCore import Qt, Slot -from PySide2.QtGui import QPainter -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, +from PySide2.QtGui import QAction, QPainter +from PySide2.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) from PySide2.QtCharts import QtCharts diff --git a/sources/pyside2/doc/tutorials/expenses/steps/02-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/02-expenses.py index 0546bc9f3..9ffb2f9d0 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/02-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/02-expenses.py @@ -39,7 +39,8 @@ ############################################################################# import sys -from PySide2.QtWidgets import QAction, QApplication, QMainWindow +from PySide2.QtGui import QAction +from PySide2.QtWidgets import QApplication, QMainWindow class MainWindow(QMainWindow): diff --git a/sources/pyside2/doc/tutorials/expenses/steps/03-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/03-expenses.py index bc753309f..1cb2f0035 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/03-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/03-expenses.py @@ -40,7 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtWidgets import QAction, QApplication, QMainWindow +from PySide2.QtGui import QAction +from PySide2.QtWidgets import QApplication, QMainWindow from PySide2.QtCharts import QtCharts diff --git a/sources/pyside2/doc/tutorials/expenses/steps/04-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/04-expenses.py index 78e9b1d1d..80a5cb16f 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/04-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/04-expenses.py @@ -40,7 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtWidgets import QAction, QApplication, QMainWindow, QWidget +from PySide2.QtGui import QAction +from PySide2.QtWidgets import QApplication, QMainWindow, QWidget class Widget(QWidget): diff --git a/sources/pyside2/doc/tutorials/expenses/steps/05-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/05-expenses.py index 6fd515f40..a72f8d990 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/05-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/05-expenses.py @@ -40,7 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QMainWindow, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QMainWindow, QTableWidget, QTableWidgetItem, QWidget) diff --git a/sources/pyside2/doc/tutorials/expenses/steps/06-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/06-expenses.py index 38fa881bf..e2c32e5c6 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/06-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/06-expenses.py @@ -40,7 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) diff --git a/sources/pyside2/doc/tutorials/expenses/steps/07-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/07-expenses.py index 6b915806d..acc7edc7c 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/07-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/07-expenses.py @@ -40,7 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) diff --git a/sources/pyside2/doc/tutorials/expenses/steps/08-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/08-expenses.py index 2f18dff9f..a6003cb35 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/08-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/08-expenses.py @@ -40,7 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) diff --git a/sources/pyside2/doc/tutorials/expenses/steps/09-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/09-expenses.py index 6b5d87e2e..3f1aed2c9 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/09-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/09-expenses.py @@ -40,8 +40,8 @@ import sys from PySide2.QtCore import Slot -from PySide2.QtGui import QPainter -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, +from PySide2.QtGui import QAction, QPainter +from PySide2.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) from PySide2.QtCharts import QtCharts diff --git a/sources/pyside2/doc/tutorials/expenses/steps/10-expenses.py b/sources/pyside2/doc/tutorials/expenses/steps/10-expenses.py index 6cc911671..2a7bddab0 100644 --- a/sources/pyside2/doc/tutorials/expenses/steps/10-expenses.py +++ b/sources/pyside2/doc/tutorials/expenses/steps/10-expenses.py @@ -40,8 +40,8 @@ import sys from PySide2.QtCore import Qt, Slot -from PySide2.QtGui import QPainter -from PySide2.QtWidgets import (QAction, QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, +from PySide2.QtGui import QAction, QPainter +from PySide2.QtWidgets import (QQApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) from PySide2.QtCharts import QtCharts diff --git a/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py b/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py index 4bc4cf48b..8b0c7a6ad 100644 --- a/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py +++ b/sources/pyside2/doc/tutorials/portingguide/chapter3/bookwindow.py @@ -40,7 +40,8 @@ from __future__ import print_function, absolute_import -from PySide2.QtWidgets import (QAction, QAbstractItemView, qApp, QDataWidgetMapper, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QAbstractItemView, qApp, QDataWidgetMapper, QHeaderView, QMainWindow, QMessageBox) from PySide2.QtGui import QKeySequence from PySide2.QtSql import (QSqlRelation, QSqlRelationalTableModel, QSqlTableModel, -- cgit v1.2.3