From 5074679cfc80ef6bf8c098cd8e90cc318ab65e6c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 19 Oct 2021 16:20:50 +0200 Subject: [PATCH] uic: Fix missing Python import when setting tab orders Add QWidget as default import so that QWidget.setTabOrder() is found. Pick-to: 6.2 Change-Id: I7593008d1395e3fddacf7124d271a0eaf4c345d9 Reviewed-by: Jarek Kobus Reviewed-by: Cristian Maureira-Fredes --- src/tools/uic/python/pythonwriteimports.cpp | 3 ++- tests/auto/tools/uic/baseline/config.ui.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/uic/python/pythonwriteimports.cpp b/src/tools/uic/python/pythonwriteimports.cpp index f9dfeb28da8..afa5c55da72 100644 --- a/src/tools/uic/python/pythonwriteimports.cpp +++ b/src/tools/uic/python/pythonwriteimports.cpp @@ -70,8 +70,9 @@ static WriteImports::ClassesPerModule defaultClasses() QStringLiteral("QPainter"), QStringLiteral("QPixmap"), QStringLiteral("QTransform"), QStringLiteral("QRadialGradient")} }, + // Add QWidget for QWidget.setTabOrder() {QStringLiteral("QtWidgets"), - {QStringLiteral("QSizePolicy")} + {QStringLiteral("QSizePolicy"), QStringLiteral("QWidget")} } }; } diff --git a/tests/auto/tools/uic/baseline/config.ui.py b/tests/auto/tools/uic/baseline/config.ui.py index f6b7eb92aa6..90cb3bbdbce 100644 --- a/tests/auto/tools/uic/baseline/config.ui.py +++ b/tests/auto/tools/uic/baseline/config.ui.py @@ -46,7 +46,7 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QPushButton, QRadioButton, QSizePolicy, QSlider, - QSpacerItem, QSpinBox, QVBoxLayout) + QSpacerItem, QSpinBox, QVBoxLayout, QWidget) from gammaview import GammaView