diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-16 01:00:11 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-17 08:52:14 +0100 |
commit | c70208c2d0fa9ef40795190ce7b9fc8e928df961 (patch) | |
tree | a17f2900cacf4c3aab2e99fa108b142fdf5e2a00 /tests/auto/tools | |
parent | 63b0b857f3cc84315a10c9b6d988bd657e7ce998 (diff) | |
parent | 0a4e5bb265c4a2345a9cbffab1b5150124b8d31e (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/uic/baseline/config.ui.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/uic/baseline/config.ui.py b/tests/auto/tools/uic/baseline/config.ui.py index f7e1ffc773..5fd558bb01 100644 --- a/tests/auto/tools/uic/baseline/config.ui.py +++ b/tests/auto/tools/uic/baseline/config.ui.py @@ -38,12 +38,12 @@ from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, QRect, QSize, QUrl, Qt) -from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QFont, +from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, QRadialGradient) from PySide2.QtWidgets import * -import GammaView +from gammaview import GammaView class Ui_Config(object): |