AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uic: Prepare for encountering fully qualified enum values in new .ui files

Browse Source 
This means checks have to be rewritten using endsWith().

It mainly affects the QSizePolicy handling whose values originate from
different sources, including numbers. To address this, refactor the
code to deal with unqualified enum value names and introduce a helper
function that fully qualifies the enumeration when writing out.

Pick-to: 6.6 6.5
Task-number: PYSIDE-2492
Task-number: PYSIDE-1735
Task-number: QTBUG-118473
Change-Id: Iccbb884777aa9c696fbf48f9d7329353ef945b0f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Friedemann Kleint 2023-10-19 13:50:53 +02:00
parent e6febd05d9
commit 2e82796022
99 changed files with 306 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -24,6 +24,24 @@ QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals;
namespace {
// Expand "Horizontal", "Qt::Horizontal" to "Qt::Orientation::Horizontal"
QString expandEnum(QString value, const QString &prefix)
{
if (value.startsWith(prefix))
return value;
const auto pos = value.lastIndexOf("::"_L1);
if (pos == -1)
return prefix + "::"_L1 + value;
value.replace(0, pos, prefix);
return value;
}
inline QString expandSizePolicyEnum(const QString &value)
{
return expandEnum(value, "QSizePolicy::Policy"_L1);
}
// figure out the toolbar area of a DOM attrib list.
// By legacy, it is stored as an integer. As of 4.3.0, it is the enumeration value.
QString toolBarAreaStringFromDOMAttributes(const CPP::WriteInitialization::DomPropertyMap &attributes) {
@ -62,27 +80,17 @@ namespace {
output << w << ", " << h << ", ";
// size type
QString sizeType;
if (const DomProperty *st = properties.value("sizeType"_L1)) {
const QString value = st->elementEnum();
if (value.startsWith("QSizePolicy::"_L1))
sizeType = value;
else
sizeType = "QSizePolicy::"_L1 + value;
} else {
sizeType = QStringLiteral("QSizePolicy::Expanding");
}
const DomProperty *st = properties.value("sizeType"_L1);
QString horizType = st != nullptr ? st->elementEnum() : "Expanding"_L1;
QString vertType = "Minimum"_L1;
// orientation
bool isVspacer = false;
if (const DomProperty *o = properties.value("orientation"_L1)) {
const QString orientation = o->elementEnum();
if (orientation == "Qt::Vertical"_L1 || orientation == "Vertical"_L1)
isVspacer = true;
}
const QString horizType = isVspacer ? "QSizePolicy::Minimum"_L1 : sizeType;
const QString vertType = isVspacer ? sizeType : "QSizePolicy::Minimum"_L1;
output << language::enumValue(horizType) << ", " << language::enumValue(vertType) << ')';
const DomProperty *o = properties.value("orientation"_L1);
if (o != nullptr && o->elementEnum().endsWith("Vertical"_L1))
std::swap(horizType, vertType);
output << language::enumValue(expandSizePolicyEnum(horizType)) << ", "
<< language::enumValue(expandSizePolicyEnum(vertType)) << ')';
}
@ -1285,7 +1293,7 @@ void WriteInitialization::writeProperties(const QString &varName,
&& m_uic->customWidgetsInfo()->extends(className, "Line")) {
// Line support
QString shape = u"QFrame::HLine"_s;
if (p->elementEnum() == "Qt::Vertical"_L1)
if (p->elementEnum().endsWith("::Vertical"_L1))
shape = u"QFrame::VLine"_s;
m_output << m_indent << varName << language::derefPointer << "setFrameShape("
@ -1594,12 +1602,18 @@ QString WriteInitialization::writeSizePolicy(const DomSizePolicy *sp)
m_sizePolicyNameMap.insert(sizePolicyHandle, spName);
m_output << m_indent << language::stackVariableWithInitParameters("QSizePolicy", spName);
QString horizPolicy;
QString vertPolicy;
if (sp->hasElementHSizeType() && sp->hasElementVSizeType()) {
m_output << "QSizePolicy" << language::qualifier << language::sizePolicy(sp->elementHSizeType())
<< ", QSizePolicy" << language::qualifier << language::sizePolicy(sp->elementVSizeType());
horizPolicy = language::sizePolicy(sp->elementHSizeType());
vertPolicy = language::sizePolicy(sp->elementVSizeType());
} else if (sp->hasAttributeHSizeType() && sp->hasAttributeVSizeType()) {
m_output << "QSizePolicy" << language::qualifier << sp->attributeHSizeType()
<< ", QSizePolicy" << language::qualifier << sp->attributeVSizeType();
horizPolicy = sp->attributeHSizeType();
vertPolicy = sp->attributeVSizeType();
}
if (!horizPolicy.isEmpty() && !vertPolicy.isEmpty()) {
m_output << language::enumValue(expandSizePolicyEnum(horizPolicy))
<< ", " << language::enumValue(expandSizePolicyEnum(vertPolicy));
}
m_output << ')' << language::eol;

2
tests/auto/tools/uic/baseline/addlinkdialog.ui.h
View File

@ -70,7 +70,7 @@ public:
verticalLayout->addLayout(formLayout);
verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer);

2
tests/auto/tools/uic/baseline/addtorrentform.ui.h
View File

@ -172,7 +172,7 @@ public:
#endif
hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName("hboxLayout");
spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(131, 31, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/authenticationdialog.ui.h
View File

@ -89,7 +89,7 @@ public:
gridLayout->addWidget(siteDescription, 1, 1, 1, 1);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 4, 0, 1, 1);

8
tests/auto/tools/uic/baseline/batchtranslation.ui.h
View File

@ -67,7 +67,7 @@ public:
vboxLayout->setObjectName("vboxLayout");
groupBox = new QGroupBox(databaseTranslationDialog);
groupBox->setObjectName("groupBox");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Maximum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
@ -97,7 +97,7 @@ public:
groupBox_2 = new QGroupBox(databaseTranslationDialog);
groupBox_2->setObjectName("groupBox_2");
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Minimum);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Minimum);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(groupBox_2->sizePolicy().hasHeightForWidth());
@ -140,7 +140,7 @@ public:
vboxLayout3->addWidget(moveDownButton);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout3->addItem(spacerItem);
@ -165,7 +165,7 @@ public:
#endif
hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName("hboxLayout1");
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem1);

4
tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
View File

@ -51,7 +51,7 @@ public:
if (BookmarkDialog->objectName().isEmpty())
BookmarkDialog->setObjectName("BookmarkDialog");
BookmarkDialog->resize(450, 135);
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(BookmarkDialog->sizePolicy().hasHeightForWidth());
@ -114,7 +114,7 @@ public:
bookmarkWidget = new BookmarkWidget(BookmarkDialog);
bookmarkWidget->setObjectName("bookmarkWidget");
bookmarkWidget->setEnabled(true);
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Ignored);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Ignored);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(bookmarkWidget->sizePolicy().hasHeightForWidth());

12
tests/auto/tools/uic/baseline/browserwidget.ui.h
View File

@ -62,7 +62,7 @@ public:
vboxLayout->setObjectName("vboxLayout");
splitter_2 = new QSplitter(Browser);
splitter_2->setObjectName("splitter_2");
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(splitter_2->sizePolicy().hasHeightForWidth());
@ -70,7 +70,7 @@ public:
splitter_2->setOrientation(Qt::Horizontal);
connectionWidget = new ConnectionWidget(splitter_2);
connectionWidget->setObjectName("connectionWidget");
QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Expanding);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Expanding);
sizePolicy1.setHorizontalStretch(1);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(connectionWidget->sizePolicy().hasHeightForWidth());
@ -78,7 +78,7 @@ public:
splitter_2->addWidget(connectionWidget);
table = new QTableView(splitter_2);
table->setObjectName("table");
QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
sizePolicy2.setHorizontalStretch(2);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(table->sizePolicy().hasHeightForWidth());
@ -91,7 +91,7 @@ public:
groupBox = new QGroupBox(Browser);
groupBox->setObjectName("groupBox");
QSizePolicy sizePolicy3(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
QSizePolicy sizePolicy3(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::MinimumExpanding);
sizePolicy3.setHorizontalStretch(0);
sizePolicy3.setVerticalStretch(0);
sizePolicy3.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
@ -107,7 +107,7 @@ public:
vboxLayout1->setObjectName("vboxLayout1");
sqlEdit = new QTextEdit(groupBox);
sqlEdit->setObjectName("sqlEdit");
QSizePolicy sizePolicy4(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
QSizePolicy sizePolicy4(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::MinimumExpanding);
sizePolicy4.setHorizontalStretch(0);
sizePolicy4.setVerticalStretch(0);
sizePolicy4.setHeightForWidth(sqlEdit->sizePolicy().hasHeightForWidth());
@ -123,7 +123,7 @@ public:
#endif
hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName("hboxLayout");
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

12
tests/auto/tools/uic/baseline/buttongroup.ui.h
View File

@ -57,7 +57,7 @@ public:
gridLayout->setObjectName("gridLayout");
easingCurvePicker = new QListWidget(Form);
easingCurvePicker->setObjectName("easingCurvePicker");
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(easingCurvePicker->sizePolicy().hasHeightForWidth());
@ -101,7 +101,7 @@ public:
groupBox = new QGroupBox(Form);
groupBox->setObjectName("groupBox");
QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Preferred);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Preferred);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
@ -111,7 +111,7 @@ public:
formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
label = new QLabel(groupBox);
label->setObjectName("label");
QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Preferred);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
@ -123,7 +123,7 @@ public:
periodSpinBox = new QDoubleSpinBox(groupBox);
periodSpinBox->setObjectName("periodSpinBox");
periodSpinBox->setEnabled(false);
QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy3(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy3.setHorizontalStretch(0);
sizePolicy3.setVerticalStretch(0);
sizePolicy3.setHeightForWidth(periodSpinBox->sizePolicy().hasHeightForWidth());
@ -170,7 +170,7 @@ public:
verticalLayout->addWidget(groupBox);
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer);
@ -179,7 +179,7 @@ public:
graphicsView = new QGraphicsView(Form);
graphicsView->setObjectName("graphicsView");
QSizePolicy sizePolicy4(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy sizePolicy4(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
sizePolicy4.setHorizontalStretch(0);
sizePolicy4.setVerticalStretch(0);
sizePolicy4.setHeightForWidth(graphicsView->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/calculator.ui.h
View File

@ -54,7 +54,7 @@ public:
if (Calculator->objectName().isEmpty())
Calculator->setObjectName("Calculator");
Calculator->resize(314, 301);
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(Calculator->sizePolicy().hasHeightForWidth());

6
tests/auto/tools/uic/baseline/calculatorform.ui.h
View File

@ -45,7 +45,7 @@ public:
if (CalculatorForm->objectName().isEmpty())
CalculatorForm->setObjectName("CalculatorForm");
CalculatorForm->resize(276, 98);
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(CalculatorForm->sizePolicy().hasHeightForWidth());
@ -154,11 +154,11 @@ public:
gridLayout->addLayout(hboxLayout, 0, 0, 1, 1);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 1, 0, 1, 1);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem1, 0, 1, 1, 1);

2
tests/auto/tools/uic/baseline/certificateinfo.ui.h
View File

@ -69,7 +69,7 @@ public:
hboxLayout2 = new QHBoxLayout();
hboxLayout2->setObjectName("hboxLayout2");
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout2->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/chatmainwindow.ui.h
View File

@ -99,7 +99,7 @@ public:
sendButton = new QPushButton(centralwidget);
sendButton->setObjectName("sendButton");
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(sendButton->sizePolicy().hasHeightForWidth());

6
tests/auto/tools/uic/baseline/chatsetnickname.ui.h
View File

@ -39,7 +39,7 @@ public:
if (NicknameDialog->objectName().isEmpty())
NicknameDialog->setObjectName("NicknameDialog");
NicknameDialog->resize(396, 105);
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Minimum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(NicknameDialog->sizePolicy().hasHeightForWidth());
@ -81,7 +81,7 @@ public:
#endif
hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName("hboxLayout");
spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(131, 31, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -95,7 +95,7 @@ public:
hboxLayout->addWidget(cancelButton);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem1);

10
tests/auto/tools/uic/baseline/config.ui.h
View File

@ -109,7 +109,7 @@ public:
hboxLayout->setContentsMargins(0, 0, 0, 0);
ButtonGroup1 = new QGroupBox(Config);
ButtonGroup1->setObjectName("ButtonGroup1");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(ButtonGroup1->sizePolicy().hasHeightForWidth());
@ -155,7 +155,7 @@ public:
hboxLayout1->setContentsMargins(0, 0, 0, 0);
size_custom = new QRadioButton(ButtonGroup1);
size_custom->setObjectName("size_custom");
QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(size_custom->sizePolicy().hasHeightForWidth());
@ -262,7 +262,7 @@ public:
skin = new QComboBox(Config);
skin->addItem(QString());
skin->setObjectName("skin");
QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Fixed);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(skin->sizePolicy().hasHeightForWidth());
@ -283,7 +283,7 @@ public:
vboxLayout->addWidget(lcdScreen);
spacerItem = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 10, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem);
@ -651,7 +651,7 @@ public:
hboxLayout3->setSpacing(6);
hboxLayout3->setObjectName("hboxLayout3");
hboxLayout3->setContentsMargins(0, 0, 0, 0);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout3->addItem(spacerItem1);

10
tests/auto/tools/uic/baseline/config.ui.py
View File

@ -44,7 +44,7 @@ class Ui_Config(object):
self.hboxLayout.setContentsMargins(0, 0, 0, 0)
self.ButtonGroup1 = QGroupBox(Config)
self.ButtonGroup1.setObjectName(u"ButtonGroup1")
sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.ButtonGroup1.sizePolicy().hasHeightForWidth())
@ -90,7 +90,7 @@ class Ui_Config(object):
self.hboxLayout1.setContentsMargins(0, 0, 0, 0)
self.size_custom = QRadioButton(self.ButtonGroup1)
self.size_custom.setObjectName(u"size_custom")
sizePolicy1 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
sizePolicy1.setHorizontalStretch(0)
sizePolicy1.setVerticalStretch(0)
sizePolicy1.setHeightForWidth(self.size_custom.sizePolicy().hasHeightForWidth())
@ -197,7 +197,7 @@ class Ui_Config(object):
self.skin = QComboBox(Config)
self.skin.addItem("")
self.skin.setObjectName(u"skin")
sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
sizePolicy2.setHorizontalStretch(0)
sizePolicy2.setVerticalStretch(0)
sizePolicy2.setHeightForWidth(self.skin.sizePolicy().hasHeightForWidth())
@ -218,7 +218,7 @@ class Ui_Config(object):
self.vboxLayout.addWidget(self.lcdScreen)
self.spacerItem = QSpacerItem(20, 10, QSizePolicy.Minimum, QSizePolicy.Expanding)
self.spacerItem = QSpacerItem(20, 10, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
self.vboxLayout.addItem(self.spacerItem)
@ -586,7 +586,7 @@ class Ui_Config(object):
self.hboxLayout3.setSpacing(6)
self.hboxLayout3.setObjectName(u"hboxLayout3")
self.hboxLayout3.setContentsMargins(0, 0, 0, 0)
self.spacerItem1 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
self.spacerItem1 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
self.hboxLayout3.addItem(self.spacerItem1)

4
tests/auto/tools/uic/baseline/connectdialog.ui.h
View File

@ -68,7 +68,7 @@ public:
hboxLayout->addWidget(editSignalsButton);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -95,7 +95,7 @@ public:
hboxLayout1->addWidget(editSlotsButton);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem1);

4
tests/auto/tools/uic/baseline/cookies.ui.h
View File

@ -44,7 +44,7 @@ public:
CookiesDialog->resize(550, 370);
gridLayout = new QGridLayout(CookiesDialog);
gridLayout->setObjectName("gridLayout");
spacerItem = new QSpacerItem(252, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(252, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 0, 0, 1, 1);
@ -70,7 +70,7 @@ public:
hboxLayout->addWidget(removeAllButton);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem1);

6
tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
View File

@ -80,7 +80,7 @@ public:
hboxLayout1 = new QHBoxLayout();
hboxLayout1->setObjectName("hboxLayout1");
spacerItem = new QSpacerItem(81, 25, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(81, 25, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem);
@ -112,7 +112,7 @@ public:
ExceptionsGroupBox->setObjectName("ExceptionsGroupBox");
gridLayout1 = new QGridLayout(ExceptionsGroupBox);
gridLayout1->setObjectName("gridLayout1");
spacerItem1 = new QSpacerItem(252, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(252, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout1->addItem(spacerItem1, 0, 0, 1, 3);
@ -136,7 +136,7 @@ public:
gridLayout1->addWidget(removeAllButton, 2, 1, 1, 1);
spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout1->addItem(spacerItem2, 2, 2, 1, 2);

2
tests/auto/tools/uic/baseline/default.ui.h
View File

@ -99,7 +99,7 @@ public:
gridLayout->addWidget(nameCombo, 0, 1, 1, 3);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 1, 3, 1, 1);

10
tests/auto/tools/uic/baseline/downloaditem.ui.h
View File

@ -48,7 +48,7 @@ public:
horizontalLayout->setObjectName("horizontalLayout");
fileIcon = new QLabel(DownloadItem);
fileIcon->setObjectName("fileIcon");
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Minimum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(fileIcon->sizePolicy().hasHeightForWidth());
@ -60,7 +60,7 @@ public:
verticalLayout_2->setObjectName("verticalLayout_2");
fileNameLabel = new SqueezeLabel(DownloadItem);
fileNameLabel->setObjectName("fileNameLabel");
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Preferred);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Preferred);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(fileNameLabel->sizePolicy().hasHeightForWidth());
@ -76,7 +76,7 @@ public:
downloadInfoLabel = new SqueezeLabel(DownloadItem);
downloadInfoLabel->setObjectName("downloadInfoLabel");
QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Preferred);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Preferred);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(downloadInfoLabel->sizePolicy().hasHeightForWidth());
@ -89,7 +89,7 @@ public:
verticalLayout = new QVBoxLayout();
verticalLayout->setObjectName("verticalLayout");
verticalSpacer = new QSpacerItem(17, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer = new QSpacerItem(17, 1, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer);
@ -109,7 +109,7 @@ public:
verticalLayout->addWidget(openButton);
verticalSpacer_2 = new QSpacerItem(17, 5, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer_2 = new QSpacerItem(17, 5, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer_2);

4
tests/auto/tools/uic/baseline/downloads.ui.h
View File

@ -55,7 +55,7 @@ public:
horizontalLayout->addWidget(cleanupButton);
spacerItem = new QSpacerItem(58, 24, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(58, 24, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(spacerItem);
@ -67,7 +67,7 @@ public:
gridLayout->addWidget(itemCount, 1, 1, 1, 1);
horizontalSpacer = new QSpacerItem(148, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(148, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(horizontalSpacer, 1, 2, 1, 1);

6
tests/auto/tools/uic/baseline/filespage.ui.h
View File

@ -51,7 +51,7 @@ public:
removeButton = new QPushButton(FilesPage);
removeButton->setObjectName("removeButton");
QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(removeButton->sizePolicy().hasHeightForWidth());
@ -64,11 +64,11 @@ public:
gridLayout->addWidget(removeAllButton, 2, 1, 1, 1);
spacerItem = new QSpacerItem(75, 16, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(75, 16, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 3, 1, 1, 1);
spacerItem1 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 31, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem1, 4, 0, 1, 1);

2
tests/auto/tools/uic/baseline/filternamedialog.ui.h
View File

@ -58,7 +58,7 @@ public:
gridLayout->addWidget(line, 1, 0, 1, 3);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 2, 0, 1, 2);

2
tests/auto/tools/uic/baseline/filterpage.ui
View File

@ -108,7 +108,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

8
tests/auto/tools/uic/baseline/filterpage.ui.h
View File

@ -76,22 +76,22 @@ public:
gridLayout1->addWidget(removeButton, 1, 1, 1, 1);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout1->addItem(spacerItem, 2, 1, 1, 1);
gridLayout->addWidget(groupBox, 4, 0, 1, 1);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem1, 0, 0, 1, 1);
spacerItem2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem2 = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem2, 5, 0, 1, 1);
spacerItem3 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem3 = new QSpacerItem(20, 10, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem3, 3, 0, 1, 1);

2
tests/auto/tools/uic/baseline/finddialog.ui
View File

@ -183,7 +183,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>

4
tests/auto/tools/uic/baseline/finddialog.ui.h
View File

@ -56,7 +56,7 @@ public:
if (FindDialog->objectName().isEmpty())
FindDialog->setObjectName("FindDialog");
FindDialog->resize(414, 170);
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Maximum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(FindDialog->sizePolicy().hasHeightForWidth());
@ -142,7 +142,7 @@ public:
vboxLayout1->addWidget(cancel);
spacerItem = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 51, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout1->addItem(spacerItem);

4
tests/auto/tools/uic/baseline/form.ui.h
View File

@ -61,7 +61,7 @@ public:
#endif
vboxLayout->setContentsMargins(1, 1, 1, 1);
vboxLayout->setObjectName("vboxLayout");
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem);
@ -106,7 +106,7 @@ public:
vboxLayout->addLayout(hboxLayout2);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem1);

2
tests/auto/tools/uic/baseline/formwindowsettings.ui.h
View File

@ -219,7 +219,7 @@ public:
gridLayout->addLayout(hboxLayout1, 3, 1, 1, 1);
spacerItem = new QSpacerItem(111, 115, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(111, 115, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 4, 1, 1, 1);

2
tests/auto/tools/uic/baseline/generalpage.ui
View File

@ -39,7 +39,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

4
tests/auto/tools/uic/baseline/generalpage.ui.h
View File

@ -57,11 +57,11 @@ public:
gridLayout->addWidget(folderLineEdit, 2, 1, 1, 1);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem, 0, 1, 1, 1);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem1, 3, 1, 1, 1);

4
tests/auto/tools/uic/baseline/gridpanel.ui.h
View File

@ -57,7 +57,7 @@ public:
gridLayout->setObjectName("gridLayout");
m_visibleCheckBox = new QCheckBox(m_gridGroupBox);
m_visibleCheckBox->setObjectName("m_visibleCheckBox");
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(m_visibleCheckBox->sizePolicy().hasHeightForWidth());
@ -91,7 +91,7 @@ public:
hboxLayout->addWidget(m_resetButton);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

6
tests/auto/tools/uic/baseline/helpdialog.ui
View File

@ -155,7 +155,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
@ -212,7 +212,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -289,7 +289,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>

6
tests/auto/tools/uic/baseline/helpdialog.ui.h
View File

@ -149,7 +149,7 @@ public:
#endif
hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName("hboxLayout");
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -175,7 +175,7 @@ public:
#endif
gridLayout->setContentsMargins(5, 5, 5, 5);
gridLayout->setObjectName("gridLayout");
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem1, 3, 0, 1, 1);
@ -211,7 +211,7 @@ public:
hboxLayout1->addWidget(helpButton);
spacerItem2 = new QSpacerItem(61, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(61, 21, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem2);

4
tests/auto/tools/uic/baseline/history.ui.h
View File

@ -44,7 +44,7 @@ public:
HistoryDialog->resize(758, 450);
gridLayout = new QGridLayout(HistoryDialog);
gridLayout->setObjectName("gridLayout");
spacerItem = new QSpacerItem(252, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(252, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 0, 0, 1, 1);
@ -70,7 +70,7 @@ public:
hboxLayout->addWidget(removeAllButton);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem1);

4
tests/auto/tools/uic/baseline/identifierpage.ui
View File

@ -19,7 +19,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -55,7 +55,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

8
tests/auto/tools/uic/baseline/identifierpage.ui.h
View File

@ -40,7 +40,7 @@ public:
IdentifierPage->resize(417, 242);
gridLayout = new QGridLayout(IdentifierPage);
gridLayout->setObjectName("gridLayout");
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem, 0, 1, 1, 1);
@ -49,11 +49,11 @@ public:
gridLayout->addWidget(identifierCheckBox, 1, 0, 1, 3);
spacerItem1 = new QSpacerItem(161, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(161, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem1, 1, 3, 1, 1);
spacerItem2 = new QSpacerItem(30, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(30, 20, QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem2, 2, 0, 1, 1);
@ -76,7 +76,7 @@ public:
gridLayout->addWidget(fileNameButton, 3, 1, 1, 2);
spacerItem3 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem3 = new QSpacerItem(20, 31, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem3, 4, 1, 1, 1);

8
tests/auto/tools/uic/baseline/imagedialog.ui.h
View File

@ -86,7 +86,7 @@ public:
colorDepthCombo = new QComboBox(dialog);
colorDepthCombo->setObjectName("colorDepthCombo");
colorDepthCombo->setGeometry(QRect(74, 83, 227, 22));
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(colorDepthCombo->sizePolicy().hasHeightForWidth());
@ -98,7 +98,7 @@ public:
nameLineEdit = new QLineEdit(dialog);
nameLineEdit->setObjectName("nameLineEdit");
nameLineEdit->setGeometry(QRect(74, 83, 227, 22));
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(1);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(nameLineEdit->sizePolicy().hasHeightForWidth());
@ -152,7 +152,7 @@ public:
vboxLayout->addLayout(gridLayout);
spacerItem = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(0, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem);
@ -163,7 +163,7 @@ public:
hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName("hboxLayout");
hboxLayout->setObjectName(QString::fromUtf8(""));
spacerItem1 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(0, 0, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem1);

2
tests/auto/tools/uic/baseline/inputpage.ui
View File

@ -19,7 +19,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

6
tests/auto/tools/uic/baseline/inputpage.ui.h
View File

@ -39,13 +39,13 @@ public:
InputPage->resize(417, 242);
gridLayout = new QGridLayout(InputPage);
gridLayout->setObjectName("gridLayout");
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem, 0, 2, 1, 1);
label = new QLabel(InputPage);
label->setObjectName("label");
QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
@ -69,7 +69,7 @@ public:
gridLayout->addLayout(hboxLayout, 1, 1, 1, 2);
spacerItem1 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 31, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem1, 2, 1, 1, 1);

2
tests/auto/tools/uic/baseline/installdialog.ui.h
View File

@ -73,7 +73,7 @@ public:
gridLayout->addWidget(closeButton, 3, 4, 1, 1);
spacerItem = new QSpacerItem(20, 56, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 56, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 4, 4, 1, 1);

2
tests/auto/tools/uic/baseline/languagesdialog.ui.h
View File

@ -87,7 +87,7 @@ public:
hboxLayout->addWidget(openFileButton);
spacerItem = new QSpacerItem(121, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(121, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

4
tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
View File

@ -88,7 +88,7 @@ public:
horizontalLayout_2->addWidget(deleteItemButton);
spacerItem = new QSpacerItem(16, 10, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(16, 10, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_2->addItem(spacerItem);
@ -117,7 +117,7 @@ public:
horizontalLayout->addWidget(itemIconSelector);
horizontalSpacer = new QSpacerItem(108, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(108, 21, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(horizontalSpacer);

6
tests/auto/tools/uic/baseline/mainwindow.ui.h
View File

@ -148,7 +148,7 @@ public:
hboxLayout->addWidget(italic);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -203,7 +203,7 @@ public:
hboxLayout1->addWidget(invertSelection);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem1);
@ -322,7 +322,7 @@ public:
hboxLayout5->addWidget(generate);
spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout5->addItem(spacerItem2);

2
tests/auto/tools/uic/baseline/myform.ui.h
View File

@ -74,7 +74,7 @@ public:
gridLayout->addWidget(checkBox_2, 1, 1, 1, 1);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 5, 0, 1, 1);

4
tests/auto/tools/uic/baseline/newactiondialog.ui.h
View File

@ -93,7 +93,7 @@ public:
horizontalLayout->addWidget(iconSelector);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(spacerItem);
@ -103,7 +103,7 @@ public:
verticalLayout->addLayout(formLayout);
verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer);

6
tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
View File

@ -57,7 +57,7 @@ public:
label = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
label->setObjectName("label");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
@ -72,7 +72,7 @@ public:
horizontalLayout->addWidget(m_comboBox);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(horizontalSpacer);
@ -89,7 +89,7 @@ public:
verticalLayout->addLayout(formLayout);
spacerItem = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(0, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/newform.ui.h
View File

@ -71,7 +71,7 @@ public:
lblPreview = new QLabel(NewForm);
lblPreview->setObjectName("lblPreview");
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(lblPreview->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/orderdialog.ui.h
View File

@ -81,7 +81,7 @@ public:
vboxLayout1->addWidget(downButton);
spacerItem = new QSpacerItem(20, 99, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 99, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout1->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/outputpage.ui
View File

@ -19,7 +19,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

8
tests/auto/tools/uic/baseline/outputpage.ui.h
View File

@ -37,13 +37,13 @@ public:
OutputPage->resize(417, 242);
gridLayout = new QGridLayout(OutputPage);
gridLayout->setObjectName("gridLayout");
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem, 0, 1, 1, 1);
label = new QLabel(OutputPage);
label->setObjectName("label");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
@ -53,7 +53,7 @@ public:
projectLineEdit = new QLineEdit(OutputPage);
projectLineEdit->setObjectName("projectLineEdit");
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(projectLineEdit->sizePolicy().hasHeightForWidth());
@ -75,7 +75,7 @@ public:
gridLayout->addWidget(collectionLineEdit, 2, 1, 1, 1);
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem1, 3, 1, 1, 1);

2
tests/auto/tools/uic/baseline/pagefold.ui.h
View File

@ -110,7 +110,7 @@ public:
gridLayout->addWidget(nameCombo, 0, 1, 1, 3);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 1, 3, 1, 1);

6
tests/auto/tools/uic/baseline/paletteeditor.ui.h
View File

@ -59,7 +59,7 @@ public:
if (qdesigner_internal__PaletteEditor->objectName().isEmpty())
qdesigner_internal__PaletteEditor->setObjectName("qdesigner_internal__PaletteEditor");
qdesigner_internal__PaletteEditor->resize(365, 409);
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(qdesigner_internal__PaletteEditor->sizePolicy().hasHeightForWidth());
@ -86,7 +86,7 @@ public:
gridLayout->setObjectName("gridLayout");
buildButton = new QtColorButton(advancedBox);
buildButton->setObjectName("buildButton");
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Ignored);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Ignored);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(buildButton->sizePolicy().hasHeightForWidth());
@ -121,7 +121,7 @@ public:
GroupBox126 = new QGroupBox(qdesigner_internal__PaletteEditor);
GroupBox126->setObjectName("GroupBox126");
QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Expanding);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Expanding);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(GroupBox126->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/passworddialog.ui.h
View File

@ -50,7 +50,7 @@ public:
introLabel = new QLabel(PasswordDialog);
introLabel->setObjectName("introLabel");
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::MinimumExpanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(introLabel->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/pathpage.ui
View File

@ -35,7 +35,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

10
tests/auto/tools/uic/baseline/pathpage.ui.h
View File

@ -44,7 +44,7 @@ public:
gridLayout->setObjectName("gridLayout");
label_2 = new QLabel(PathPage);
label_2->setObjectName("label_2");
QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
@ -57,7 +57,7 @@ public:
gridLayout->addWidget(filterLineEdit, 0, 1, 1, 2);
spacerItem = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem = new QSpacerItem(20, 10, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem, 1, 1, 1, 1);
@ -73,7 +73,7 @@ public:
addButton = new QPushButton(PathPage);
addButton->setObjectName("addButton");
QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(addButton->sizePolicy().hasHeightForWidth());
@ -88,11 +88,11 @@ public:
gridLayout->addWidget(removeButton, 4, 3, 1, 1);
spacerItem1 = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 51, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem1, 5, 3, 1, 1);
spacerItem2 = new QSpacerItem(20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem2 = new QSpacerItem(20, 31, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem2, 6, 2, 1, 1);

2
tests/auto/tools/uic/baseline/phrasebookbox.ui
View File

@ -146,7 +146,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>

2
tests/auto/tools/uic/baseline/phrasebookbox.ui.h
View File

@ -135,7 +135,7 @@ public:
buttonLayout->addWidget(closeBut);
spacer1 = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacer1 = new QSpacerItem(20, 51, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
buttonLayout->addItem(spacer1);

2
tests/auto/tools/uic/baseline/preferencesdialog.ui.h
View File

@ -109,7 +109,7 @@ public:
gridLayout->addWidget(m_removeTemplatePathButton, 1, 1, 1, 1);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 1, 2, 1, 1);

8
tests/auto/tools/uic/baseline/previewdialogbase.ui.h
View File

@ -71,7 +71,7 @@ public:
paperSizeCombo = new QComboBox(PreviewDialogBase);
paperSizeCombo->setObjectName("paperSizeCombo");
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(paperSizeCombo->sizePolicy().hasHeightForWidth());
@ -91,7 +91,7 @@ public:
hboxLayout->addWidget(paperOrientationCombo);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -116,7 +116,7 @@ public:
previewArea = new QScrollArea(PreviewDialogBase);
previewArea->setObjectName("previewArea");
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Preferred);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Preferred);
sizePolicy1.setHorizontalStretch(1);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(previewArea->sizePolicy().hasHeightForWidth());
@ -136,7 +136,7 @@ public:
progressBar = new QProgressBar(PreviewDialogBase);
progressBar->setObjectName("progressBar");
progressBar->setEnabled(false);
QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Fixed);
sizePolicy2.setHorizontalStretch(1);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(progressBar->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/previewwidget.ui
View File

@ -107,7 +107,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>

4
tests/auto/tools/uic/baseline/previewwidget.ui.h
View File

@ -69,7 +69,7 @@ public:
if (qdesigner_internal__PreviewWidget->objectName().isEmpty())
qdesigner_internal__PreviewWidget->setObjectName("qdesigner_internal__PreviewWidget");
qdesigner_internal__PreviewWidget->resize(471, 251);
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Minimum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(qdesigner_internal__PreviewWidget->sizePolicy().hasHeightForWidth());
@ -141,7 +141,7 @@ public:
gridLayout->addLayout(vboxLayout, 0, 1, 3, 1);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(spacerItem, 3, 0, 1, 2);

12
tests/auto/tools/uic/baseline/qfiledialog.ui.h
View File

@ -84,7 +84,7 @@ public:
hboxLayout->setObjectName("hboxLayout");
lookInCombo = new QFileDialogComboBox(QFileDialog);
lookInCombo->setObjectName("lookInCombo");
QSizePolicy sizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(1);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(lookInCombo->sizePolicy().hasHeightForWidth());
@ -128,7 +128,7 @@ public:
splitter = new QSplitter(QFileDialog);
splitter->setObjectName("splitter");
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(splitter->sizePolicy().hasHeightForWidth());
@ -180,7 +180,7 @@ public:
fileNameLabel = new QLabel(QFileDialog);
fileNameLabel->setObjectName("fileNameLabel");
QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Preferred);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Preferred);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(fileNameLabel->sizePolicy().hasHeightForWidth());
@ -191,7 +191,7 @@ public:
fileNameEdit = new QFileDialogLineEdit(QFileDialog);
fileNameEdit->setObjectName("fileNameEdit");
QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Fixed);
QSizePolicy sizePolicy3(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Fixed);
sizePolicy3.setHorizontalStretch(1);
sizePolicy3.setVerticalStretch(0);
sizePolicy3.setHeightForWidth(fileNameEdit->sizePolicy().hasHeightForWidth());
@ -208,7 +208,7 @@ public:
fileTypeLabel = new QLabel(QFileDialog);
fileTypeLabel->setObjectName("fileTypeLabel");
QSizePolicy sizePolicy4(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy4(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy4.setHorizontalStretch(0);
sizePolicy4.setVerticalStretch(0);
sizePolicy4.setHeightForWidth(fileTypeLabel->sizePolicy().hasHeightForWidth());
@ -218,7 +218,7 @@ public:
fileTypeCombo = new QComboBox(QFileDialog);
fileTypeCombo->setObjectName("fileTypeCombo");
QSizePolicy sizePolicy5(QSizePolicy::Expanding, QSizePolicy::Fixed);
QSizePolicy sizePolicy5(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Fixed);
sizePolicy5.setHorizontalStretch(0);
sizePolicy5.setVerticalStretch(0);
sizePolicy5.setHeightForWidth(fileTypeCombo->sizePolicy().hasHeightForWidth());

8
tests/auto/tools/uic/baseline/qpagesetupwidget.ui
View File

@ -239,7 +239,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
@ -286,7 +286,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -318,10 +318,10 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>

20
tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
View File

@ -132,7 +132,7 @@ public:
gridLayout_2->addWidget(paperSource, 2, 1, 1, 1);
horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout_2->addItem(horizontalSpacer_4, 1, 2, 1, 1);
@ -146,7 +146,7 @@ public:
horizontalLayout_4->addWidget(unitCombo);
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_4->addItem(horizontalSpacer_3);
@ -183,7 +183,7 @@ public:
verticalLayout->addWidget(reversePortrait);
verticalSpacer_5 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer_5 = new QSpacerItem(0, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer_5);
@ -205,7 +205,7 @@ public:
horizontalLayout = new QHBoxLayout();
horizontalLayout->setObjectName("horizontalLayout");
horizontalSpacer_7 = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_7 = new QSpacerItem(0, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(horizontalSpacer_7);
@ -216,7 +216,7 @@ public:
horizontalLayout->addWidget(leftMargin);
horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(horizontalSpacer);
@ -227,14 +227,14 @@ public:
horizontalLayout->addWidget(rightMargin);
horizontalSpacer_8 = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_8 = new QSpacerItem(0, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(horizontalSpacer_8);
gridLayout->addLayout(horizontalLayout, 1, 0, 1, 3);
horizontalSpacer_2 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
horizontalSpacer_2 = new QSpacerItem(0, 20, QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(horizontalSpacer_2, 0, 2, 1, 1);
@ -245,7 +245,7 @@ public:
gridLayout->addWidget(bottomMargin, 2, 1, 1, 1);
horizontalSpacer_5 = new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
horizontalSpacer_5 = new QSpacerItem(0, 20, QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(horizontalSpacer_5, 0, 0, 1, 1);
@ -264,7 +264,7 @@ public:
gridLayout_4->addWidget(pagesPerSheetCombo, 0, 1, 1, 1);
horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout_4->addItem(horizontalSpacer_6, 0, 2, 1, 1);
@ -286,7 +286,7 @@ public:
gridLayout_3->addWidget(pagesPerSheetButtonGroup, 5, 0, 1, 2);
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout_3->addItem(verticalSpacer, 6, 0, 1, 1);

16
tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
View File

@ -84,7 +84,7 @@ public:
horizontalLayout->setObjectName("horizontalLayout");
gbPrintRange = new QGroupBox(copiesTab);
gbPrintRange->setObjectName("gbPrintRange");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Minimum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(gbPrintRange->sizePolicy().hasHeightForWidth());
@ -131,7 +131,7 @@ public:
_4->addWidget(to);
spacerItem = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(0, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
_4->addItem(spacerItem);
@ -143,7 +143,7 @@ public:
_3->addWidget(printSelection);
verticalSpacer = new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer = new QSpacerItem(1, 1, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
_3->addItem(verticalSpacer);
@ -166,7 +166,7 @@ public:
gridLayout->addWidget(copies, 0, 1, 1, 2);
horizontalSpacer = new QSpacerItem(91, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(91, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(horizontalSpacer, 0, 3, 1, 1);
@ -177,7 +177,7 @@ public:
outputIcon = new QLabel(groupBox);
outputIcon->setObjectName("outputIcon");
QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Ignored);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Ignored);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(outputIcon->sizePolicy().hasHeightForWidth());
@ -190,7 +190,7 @@ public:
gridLayout->addWidget(reverse, 2, 0, 1, 2);
verticalSpacer_2 = new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer_2 = new QSpacerItem(0, 1, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout->addItem(verticalSpacer_2, 3, 0, 1, 4);
@ -207,7 +207,7 @@ public:
colorMode->setObjectName("colorMode");
gridLayout_4 = new QGridLayout(colorMode);
gridLayout_4->setObjectName("gridLayout_4");
verticalSpacer_6 = new QSpacerItem(1, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer_6 = new QSpacerItem(1, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
gridLayout_4->addItem(verticalSpacer_6, 2, 0, 1, 1);
@ -249,7 +249,7 @@ public:
verticalLayout->addWidget(duplexShort);
verticalSpacer1 = new QSpacerItem(1, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalSpacer1 = new QSpacerItem(1, 0, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
verticalLayout->addItem(verticalSpacer1);

4
tests/auto/tools/uic/baseline/qprintwidget.ui.h
View File

@ -62,7 +62,7 @@ public:
printers = new QComboBox(printerGroup);
printers->setObjectName("printers");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(3);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(printers->sizePolicy().hasHeightForWidth());
@ -72,7 +72,7 @@ public:
properties = new QPushButton(printerGroup);
properties->setObjectName("properties");
QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(1);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(properties->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui
View File

@ -176,7 +176,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>

4
tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
View File

@ -144,7 +144,7 @@ public:
#endif
hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName("hboxLayout");
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -162,7 +162,7 @@ public:
#endif
hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName("hboxLayout1");
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem1);

2
tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
View File

@ -42,7 +42,7 @@ public:
vboxLayout->setObjectName("vboxLayout");
gradientEditor = new QtGradientEditor(QtGradientDialog);
gradientEditor->setObjectName("gradientEditor");
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::MinimumExpanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(gradientEditor->sizePolicy().hasHeightForWidth());

18
tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
View File

@ -127,7 +127,7 @@ public:
frame = new QFrame(QtGradientEditor);
frame->setObjectName("frame");
frame->setGeometry(QRect(10, 69, 193, 150));
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(frame->sizePolicy().hasHeightForWidth());
@ -204,7 +204,7 @@ public:
zoomAllButton = new QToolButton(QtGradientEditor);
zoomAllButton->setObjectName("zoomAllButton");
zoomAllButton->setGeometry(QRect(279, 260, 72, 26));
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(zoomAllButton->sizePolicy().hasHeightForWidth());
@ -220,7 +220,7 @@ public:
frame_2 = new QFrame(QtGradientEditor);
frame_2->setObjectName("frame_2");
frame_2->setGeometry(QRect(48, 333, 155, 23));
QSizePolicy sizePolicy2(QSizePolicy::Ignored, QSizePolicy::Preferred);
QSizePolicy sizePolicy2(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Preferred);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(frame_2->sizePolicy().hasHeightForWidth());
@ -232,7 +232,7 @@ public:
hboxLayout->setContentsMargins(0, 0, 0, 0);
hueColorLine = new QtColorLine(frame_2);
hueColorLine->setObjectName("hueColorLine");
QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Preferred);
QSizePolicy sizePolicy3(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Preferred);
sizePolicy3.setHorizontalStretch(0);
sizePolicy3.setVerticalStretch(0);
sizePolicy3.setHeightForWidth(hueColorLine->sizePolicy().hasHeightForWidth());
@ -335,7 +335,7 @@ public:
colorLabel = new QLabel(QtGradientEditor);
colorLabel->setObjectName("colorLabel");
colorLabel->setGeometry(QRect(10, 298, 32, 29));
QSizePolicy sizePolicy4(QSizePolicy::Fixed, QSizePolicy::Preferred);
QSizePolicy sizePolicy4(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Preferred);
sizePolicy4.setHorizontalStretch(0);
sizePolicy4.setVerticalStretch(0);
sizePolicy4.setHeightForWidth(colorLabel->sizePolicy().hasHeightForWidth());
@ -346,7 +346,7 @@ public:
hsvRadioButton = new QRadioButton(QtGradientEditor);
hsvRadioButton->setObjectName("hsvRadioButton");
hsvRadioButton->setGeometry(QRect(80, 301, 49, 23));
QSizePolicy sizePolicy5(QSizePolicy::Fixed, QSizePolicy::Fixed);
QSizePolicy sizePolicy5(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
sizePolicy5.setHorizontalStretch(0);
sizePolicy5.setVerticalStretch(0);
sizePolicy5.setHeightForWidth(hsvRadioButton->sizePolicy().hasHeightForWidth());
@ -471,7 +471,7 @@ public:
zoomButtonsWidget = new QWidget(QtGradientEditor);
zoomButtonsWidget->setObjectName("zoomButtonsWidget");
zoomButtonsWidget->setGeometry(QRect(209, 260, 64, 26));
QSizePolicy sizePolicy6(QSizePolicy::Maximum, QSizePolicy::Preferred);
QSizePolicy sizePolicy6(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Preferred);
sizePolicy6.setHorizontalStretch(0);
sizePolicy6.setVerticalStretch(0);
sizePolicy6.setHeightForWidth(zoomButtonsWidget->sizePolicy().hasHeightForWidth());
@ -489,14 +489,14 @@ public:
hboxLayout4->addWidget(zoomOutButton);
spacerItem = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(0, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout4->addItem(spacerItem);
detailsButton = new QToolButton(QtGradientEditor);
detailsButton->setObjectName("detailsButton");
detailsButton->setGeometry(QRect(176, 40, 25, 22));
QSizePolicy sizePolicy7(QSizePolicy::Fixed, QSizePolicy::Ignored);
QSizePolicy sizePolicy7(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Ignored);
sizePolicy7.setHorizontalStretch(0);
sizePolicy7.setVerticalStretch(0);
sizePolicy7.setHeightForWidth(detailsButton->sizePolicy().hasHeightForWidth());

4
tests/auto/tools/uic/baseline/qtgradientview.ui.h
View File

@ -44,7 +44,7 @@ public:
hboxLayout->setObjectName("hboxLayout");
newButton = new QToolButton(QtGradientView);
newButton->setObjectName("newButton");
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Minimum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(newButton->sizePolicy().hasHeightForWidth());
@ -81,7 +81,7 @@ public:
hboxLayout->addWidget(removeButton);
spacerItem = new QSpacerItem(71, 26, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(71, 26, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h
View File

@ -42,7 +42,7 @@ public:
vboxLayout->setObjectName("vboxLayout");
gradientView = new QtGradientView(QtGradientViewDialog);
gradientView->setObjectName("gradientView");
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::MinimumExpanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(gradientView->sizePolicy().hasHeightForWidth());

2
tests/auto/tools/uic/baseline/qtresourceeditordialog.ui
View File

@ -59,7 +59,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Ignored</enum>
<enum>QSizePolicy::Policy::Ignored</enum>
</property>
<property name="sizeHint" >
<size>

6
tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
View File

@ -64,7 +64,7 @@ public:
gridLayout->setContentsMargins(0, 0, 0, 0);
qrcFileList = new QListWidget(layoutWidget);
qrcFileList->setObjectName("qrcFileList");
QSizePolicy sizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding);
QSizePolicy sizePolicy(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Expanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(qrcFileList->sizePolicy().hasHeightForWidth());
@ -82,7 +82,7 @@ public:
gridLayout->addWidget(removeQrcButton, 1, 2, 1, 1);
spacerItem = new QSpacerItem(21, 20, QSizePolicy::Ignored, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(21, 20, QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 1, 3, 1, 1);
@ -117,7 +117,7 @@ public:
gridLayout1->addWidget(removeResourceButton, 1, 2, 1, 1);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout1->addItem(horizontalSpacer, 1, 3, 1, 1);

4
tests/auto/tools/uic/baseline/qttoolbardialog.ui.h
View File

@ -106,7 +106,7 @@ public:
vboxLayout->setObjectName("vboxLayout");
upButton = new QToolButton(QtToolBarDialog);
upButton->setObjectName("upButton");
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(upButton->sizePolicy().hasHeightForWidth());
@ -135,7 +135,7 @@ public:
vboxLayout->addWidget(downButton);
spacerItem = new QSpacerItem(29, 16, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(29, 16, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/qttrid.ui
View File

@ -50,7 +50,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

6
tests/auto/tools/uic/baseline/qttrid.ui.h
View File

@ -92,11 +92,11 @@ public:
gridLayout->addWidget(launchButton, 1, 1, 1, 1);
spacerItem = new QSpacerItem(101, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(101, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 1, 2, 1, 1);
spacerItem1 = new QSpacerItem(113, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem1 = new QSpacerItem(113, 16, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem1, 2, 1, 1, 1);
@ -179,7 +179,7 @@ public:
gridLayout1->addWidget(syncContentsButton, 3, 1, 1, 1);
spacerItem2 = new QSpacerItem(81, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(81, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout1->addItem(spacerItem2, 3, 2, 1, 1);

2
tests/auto/tools/uic/baseline/remotecontrol.ui
View File

@ -50,7 +50,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

6
tests/auto/tools/uic/baseline/remotecontrol.ui.h
View File

@ -92,11 +92,11 @@ public:
gridLayout->addWidget(launchButton, 1, 1, 1, 1);
spacerItem = new QSpacerItem(101, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(101, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 1, 2, 1, 1);
spacerItem1 = new QSpacerItem(113, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem1 = new QSpacerItem(113, 16, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem1, 2, 1, 1, 1);
@ -179,7 +179,7 @@ public:
gridLayout1->addWidget(syncContentsButton, 3, 1, 1, 1);
spacerItem2 = new QSpacerItem(81, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(81, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout1->addItem(spacerItem2, 3, 2, 1, 1);

8
tests/auto/tools/uic/baseline/settings.ui.h
View File

@ -56,7 +56,7 @@ public:
hboxLayout->setObjectName("hboxLayout");
label = new QLabel(Dialog);
label->setObjectName("label");
QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Maximum, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
@ -68,7 +68,7 @@ public:
deviceCombo = new QComboBox(Dialog);
deviceCombo->setObjectName("deviceCombo");
QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(deviceCombo->sizePolicy().hasHeightForWidth());
@ -137,7 +137,7 @@ public:
hboxLayout3->addWidget(label_3);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout3->addItem(spacerItem);
@ -147,7 +147,7 @@ public:
hboxLayout3->addWidget(label_5);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout3->addItem(spacerItem1);

4
tests/auto/tools/uic/baseline/signalslotdialog.ui.h
View File

@ -76,7 +76,7 @@ public:
hboxLayout->addWidget(removeSlotButton);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -110,7 +110,7 @@ public:
hboxLayout1->addWidget(removeSignalButton);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout1->addItem(spacerItem1);

2
tests/auto/tools/uic/baseline/sslerrors.ui.h
View File

@ -59,7 +59,7 @@ public:
hboxLayout->addWidget(certificateChainButton);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

4
tests/auto/tools/uic/baseline/statistics.ui.h
View File

@ -65,7 +65,7 @@ public:
hboxLayout->setSpacing(6);
hboxLayout->setObjectName("hboxLayout");
hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
spacer4_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacer4_2 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacer4_2);
@ -74,7 +74,7 @@ public:
hboxLayout->addWidget(closeBtn);
spacer4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacer4 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacer4);

6
tests/auto/tools/uic/baseline/stringlisteditor.ui.h
View File

@ -108,7 +108,7 @@ public:
hboxLayout->addWidget(deleteButton);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -143,7 +143,7 @@ public:
#endif
vboxLayout2->setContentsMargins(0, 0, 0, 0);
vboxLayout2->setObjectName("vboxLayout2");
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout2->addItem(spacerItem1);
@ -157,7 +157,7 @@ public:
vboxLayout2->addWidget(downButton);
spacerItem2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem2 = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout2->addItem(spacerItem2);

6
tests/auto/tools/uic/baseline/stylesheeteditor.ui
View File

@ -25,7 +25,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
@ -41,7 +41,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
@ -76,7 +76,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

12
tests/auto/tools/uic/baseline/stylesheeteditor.ui.h
View File

@ -51,11 +51,11 @@ public:
gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName("gridLayout");
spacerItem = new QSpacerItem(32, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(32, 20, QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem, 0, 6, 1, 1);
spacerItem1 = new QSpacerItem(32, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(32, 20, QSizePolicy::Policy::MinimumExpanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem1, 0, 0, 1, 1);
@ -67,13 +67,13 @@ public:
gridLayout->addWidget(styleSheetCombo, 0, 5, 1, 1);
spacerItem2 = new QSpacerItem(10, 16, QSizePolicy::Fixed, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(10, 16, QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem2, 0, 3, 1, 1);
styleCombo = new QComboBox(StyleSheetEditor);
styleCombo->setObjectName("styleCombo");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(styleCombo->sizePolicy().hasHeightForWidth());
@ -83,7 +83,7 @@ public:
label_7 = new QLabel(StyleSheetEditor);
label_7->setObjectName("label_7");
QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Preferred);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Preferred);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(label_7->sizePolicy().hasHeightForWidth());
@ -97,7 +97,7 @@ public:
#endif
hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName("hboxLayout");
spacerItem3 = new QSpacerItem(321, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem3 = new QSpacerItem(321, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem3);

4
tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
View File

@ -94,7 +94,7 @@ public:
editFind = new QLineEdit(frameFind);
editFind->setObjectName("editFind");
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(editFind->sizePolicy().hasHeightForWidth());
@ -143,7 +143,7 @@ public:
hboxLayout->addWidget(labelWrapped);
spacerItem = new QSpacerItem(81, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(81, 21, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);

14
tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h
View File

@ -107,7 +107,7 @@ public:
horizontalLayout_5->addWidget(itemIconSelector);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_5->addItem(horizontalSpacer);
@ -126,7 +126,7 @@ public:
widget = new QWidget(qdesigner_internal__TableWidgetEditor);
widget->setObjectName("widget");
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
@ -140,7 +140,7 @@ public:
gridLayout_2->setObjectName("gridLayout_2");
columnsListWidget = new QListWidget(columnsBox);
columnsListWidget->setObjectName("columnsListWidget");
QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Expanding);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Expanding);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(columnsListWidget->sizePolicy().hasHeightForWidth());
@ -161,7 +161,7 @@ public:
horizontalLayout_3->addWidget(deleteColumnButton);
spacerItem = new QSpacerItem(0, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(0, 23, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_3->addItem(spacerItem);
@ -190,7 +190,7 @@ public:
horizontalLayout_2->addWidget(columnIconSelector);
spacerItem1 = new QSpacerItem(0, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(0, 21, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_2->addItem(spacerItem1);
@ -224,7 +224,7 @@ public:
horizontalLayout_4->addWidget(deleteRowButton);
spacerItem2 = new QSpacerItem(0, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(0, 23, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_4->addItem(spacerItem2);
@ -253,7 +253,7 @@ public:
horizontalLayout->addWidget(rowIconSelector);
spacerItem3 = new QSpacerItem(0, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem3 = new QSpacerItem(0, 21, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(spacerItem3);

2
tests/auto/tools/uic/baseline/textfinder.ui.h
View File

@ -77,7 +77,7 @@ public:
vboxLayout->addWidget(textEdit);
spacerItem = new QSpacerItem(20, 16, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 16, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem);

2
tests/auto/tools/uic/baseline/topicchooser.ui.h
View File

@ -67,7 +67,7 @@ public:
hboxLayout->setObjectName("hboxLayout");
hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
hboxLayout->setContentsMargins(0, 0, 0, 0);
Horizontal_Spacing2 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
Horizontal_Spacing2 = new QSpacerItem(20, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(Horizontal_Spacing2);

2
tests/auto/tools/uic/baseline/translatedialog.ui
View File

@ -218,7 +218,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>

6
tests/auto/tools/uic/baseline/translatedialog.ui.h
View File

@ -58,7 +58,7 @@ public:
if (TranslateDialog->objectName().isEmpty())
TranslateDialog->setObjectName("TranslateDialog");
TranslateDialog->resize(407, 145);
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Maximum);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(TranslateDialog->sizePolicy().hasHeightForWidth());
@ -117,7 +117,7 @@ public:
vboxLayout1->addWidget(ckMarkFinished);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout1->addItem(spacerItem);
@ -152,7 +152,7 @@ public:
vboxLayout2->addWidget(cancel);
spacerItem1 = new QSpacerItem(20, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem1 = new QSpacerItem(20, 51, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout2->addItem(spacerItem1);

12
tests/auto/tools/uic/baseline/treewidgeteditor.ui.h
View File

@ -105,7 +105,7 @@ public:
horizontalLayout_4->addWidget(deleteItemButton);
spacerItem = new QSpacerItem(28, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(28, 23, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_4->addItem(spacerItem);
@ -144,7 +144,7 @@ public:
horizontalLayout_2->addWidget(itemIconSelector);
horizontalSpacer = new QSpacerItem(288, 21, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(288, 21, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_2->addItem(horizontalSpacer);
@ -156,7 +156,7 @@ public:
columnsBox = new QGroupBox(qdesigner_internal__TreeWidgetEditor);
columnsBox->setObjectName("columnsBox");
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(columnsBox->sizePolicy().hasHeightForWidth());
@ -165,7 +165,7 @@ public:
gridLayout_2->setObjectName("gridLayout_2");
listWidget = new QListWidget(columnsBox);
listWidget->setObjectName("listWidget");
QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Expanding);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Ignored, QSizePolicy::Policy::Expanding);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(listWidget->sizePolicy().hasHeightForWidth());
@ -186,7 +186,7 @@ public:
horizontalLayout_3->addWidget(deleteColumnButton);
spacerItem1 = new QSpacerItem(13, 23, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(13, 23, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout_3->addItem(spacerItem1);
@ -215,7 +215,7 @@ public:
horizontalLayout->addWidget(columnIconSelector);
spacerItem2 = new QSpacerItem(0, 10, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(0, 10, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(spacerItem2);

4
tests/auto/tools/uic/baseline/validators.ui
View File

@ -179,7 +179,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -370,7 +370,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

14
tests/auto/tools/uic/baseline/validators.ui.h
View File

@ -99,7 +99,7 @@ public:
hboxLayout->addWidget(localeSelector);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout->addItem(spacerItem);
@ -140,7 +140,7 @@ public:
minVal = new QSpinBox(groupBox);
minVal->setObjectName("minVal");
QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(1);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(minVal->sizePolicy().hasHeightForWidth());
@ -183,7 +183,7 @@ public:
vboxLayout2->setObjectName("vboxLayout2");
ledWidget = new LEDWidget(frame);
ledWidget->setObjectName("ledWidget");
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy1(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(ledWidget->sizePolicy().hasHeightForWidth());
@ -204,7 +204,7 @@ public:
vboxLayout1->addLayout(hboxLayout1);
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
vboxLayout1->addItem(spacerItem1);
@ -332,7 +332,7 @@ public:
vboxLayout3->addLayout(hboxLayout2);
spacerItem2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem2 = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
vboxLayout3->addItem(spacerItem2);
@ -344,7 +344,7 @@ public:
vboxLayout->addWidget(groupBox_2);
spacerItem3 = new QSpacerItem(20, 111, QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem3 = new QSpacerItem(20, 111, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding);
vboxLayout->addItem(spacerItem3);
@ -354,7 +354,7 @@ public:
#endif
hboxLayout3->setContentsMargins(0, 0, 0, 0);
hboxLayout3->setObjectName("hboxLayout3");
spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
hboxLayout3->addItem(spacerItem4);

10
tests/auto/tools/uic/baseline/wateringconfigdialog.ui
View File

@ -68,7 +68,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -98,7 +98,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -156,7 +156,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -201,7 +201,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
@ -298,7 +298,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>

20
tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h
View File

@ -84,7 +84,7 @@ public:
plantComboBox->addItem(QString());
plantComboBox->addItem(QString());
plantComboBox->setObjectName("plantComboBox");
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(plantComboBox->sizePolicy().hasHeightForWidth());
@ -92,7 +92,7 @@ public:
gridLayout->addWidget(plantComboBox, 0, 1, 1, 3);
spacerItem = new QSpacerItem(67, 16, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem = new QSpacerItem(67, 16, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem, 1, 0, 1, 1);
@ -106,7 +106,7 @@ public:
gridLayout->addWidget(temperatureCheckBox, 3, 1, 1, 3);
spacerItem1 = new QSpacerItem(16, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(16, 20, QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem1, 4, 1, 1, 1);
@ -119,7 +119,7 @@ public:
gridLayout->addWidget(temperatureSpinBox, 4, 2, 1, 1);
spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem2 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem2, 4, 3, 1, 1);
@ -128,7 +128,7 @@ public:
gridLayout->addWidget(rainCheckBox, 5, 1, 1, 3);
spacerItem3 = new QSpacerItem(16, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
spacerItem3 = new QSpacerItem(16, 20, QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem3, 6, 1, 1, 1);
@ -139,11 +139,11 @@ public:
gridLayout->addWidget(rainSpinBox, 6, 2, 1, 1);
spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem4, 6, 3, 1, 1);
spacerItem5 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem5 = new QSpacerItem(20, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem5, 7, 2, 1, 1);
@ -195,11 +195,11 @@ public:
gridLayout->addWidget(filterCheckBox, 11, 1, 1, 2);
spacerItem6 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed);
spacerItem6 = new QSpacerItem(20, 10, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
gridLayout->addItem(spacerItem6, 12, 0, 1, 1);
spacerItem7 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem7 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout->addItem(spacerItem7, 4, 4, 1, 1);
@ -208,7 +208,7 @@ public:
gridLayout1 = new QGridLayout();
gridLayout1->setObjectName("gridLayout1");
spacerItem8 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem8 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout1->addItem(spacerItem8, 0, 1, 1, 1);

8
tests/auto/tools/uic/baseline/window.ui.h
View File

@ -48,13 +48,13 @@ public:
gridLayout_2 = new QGridLayout(Window);
gridLayout_2->setObjectName("gridLayout_2");
gridLayout_2->setSizeConstraint(QLayout::SetFixedSize);
horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout_2->addItem(horizontalSpacer_2, 0, 0, 1, 1);
displayWidget = new DisplayWidget(Window);
displayWidget->setObjectName("displayWidget");
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
sizePolicy.setHorizontalStretch(200);
sizePolicy.setVerticalStretch(200);
sizePolicy.setHeightForWidth(displayWidget->sizePolicy().hasHeightForWidth());
@ -64,7 +64,7 @@ public:
gridLayout_2->addWidget(displayWidget, 0, 1, 1, 1);
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
gridLayout_2->addItem(horizontalSpacer_3, 0, 2, 1, 1);
@ -110,7 +110,7 @@ public:
horizontalLayout = new QHBoxLayout();
horizontalLayout->setObjectName("horizontalLayout");
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum);
horizontalLayout->addItem(horizontalSpacer);