diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-05-04 11:08:31 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-18 14:58:10 +0200 |
| commit | 92c19f742d10b7b31dcc9f703aa8d771e661d6ab (patch) | |
| tree | b8745f1586ff87c833e3252ae1dfb02cede5901c | |
| parent | 6ac6d5097ecdf6605f1487464da8fc8ab5b20a4f (diff) | |
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
Fixes: PYSIDE-1287
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 2f975b39a967cd2ac1c234a200eb6b9c11d8b5b2)
| -rw-r--r-- | src/tools/uic/python/pythonwriteimports.cpp | 7 | ||||
| -rw-r--r-- | 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 b3b6e09373..8cf1600b41 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 |