From 2f975b39a967cd2ac1c234a200eb6b9c11d8b5b2 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Mon, 4 May 2020 11:08:31 +0200 Subject: uic/Python: import all the classes for QtCore and QtGui We already had this approach for QtWidgets, so to avoid adding the specific cases every time, we import all the classes from QtCore and QtGui. Change-Id: I38dd2eec3bbdfb83f156a48f35a2f4fda44528c7 Pick-to: 5.15 Fixes: PYSIDE-1287 Reviewed-by: Friedemann Kleint --- src/tools/uic/python/pythonwriteimports.cpp | 7 ++----- tests/auto/tools/uic/baseline/config.ui.py | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/tools/uic/python/pythonwriteimports.cpp b/src/tools/uic/python/pythonwriteimports.cpp index 95e039e6f0..f8d5e96729 100644 --- a/src/tools/uic/python/pythonwriteimports.cpp +++ b/src/tools/uic/python/pythonwriteimports.cpp @@ -39,11 +39,8 @@ QT_BEGIN_NAMESPACE static const char *standardImports = -R"I(from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, - QObject, QPoint, QRect, QSize, QTime, QUrl, Qt) -from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter, - QPixmap, QRadialGradient) +R"I(from PySide2.QtCore import * +from PySide2.QtGui import * from PySide2.QtWidgets import * )I"; diff --git a/tests/auto/tools/uic/baseline/config.ui.py b/tests/auto/tools/uic/baseline/config.ui.py index 7acd379fd5..be8e939f5e 100644 --- a/tests/auto/tools/uic/baseline/config.ui.py +++ b/tests/auto/tools/uic/baseline/config.ui.py @@ -36,11 +36,8 @@ ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, - QObject, QPoint, QRect, QSize, QTime, QUrl, Qt) -from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter, - QPixmap, QRadialGradient) +from PySide2.QtCore import * +from PySide2.QtGui import * from PySide2.QtWidgets import * from gammaview import GammaView -- cgit v1.2.3