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

uic: Use fully qualified enum value for remaining cases

Browse Source 
Task-number: PYSIDE-2492
Task-number: PYSIDE-1735
Task-number: QTBUG-118473
Change-Id: I4e5e328b0757145df2ceb550e2f90a64be91d5e9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Friedemann Kleint 2023-10-19 15:46:10 +02:00
parent effe9bd026
commit cea33d7387
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1300,9 +1300,9 @@ void WriteInitialization::writeProperties(const QString &varName,
} else if (propertyName == "orientation"_L1
&& m_uic->customWidgetsInfo()->extends(className, "Line")) {
// Line support
QString shape = u"QFrame::HLine"_s;
QString shape = u"QFrame::Shape::HLine"_s;
if (p->elementEnum().endsWith("::Vertical"_L1))
shape = u"QFrame::VLine"_s;
shape = u"QFrame::Shape::VLine"_s;
m_output << m_indent << varName << language::derefPointer << "setFrameShape("
<< language::enumValue(shape) << ')' << language::eol;
@ -1310,7 +1310,7 @@ void WriteInitialization::writeProperties(const QString &varName,
if (!frameShadowEncountered) {
m_output << m_indent << varName << language::derefPointer
<< "setFrameShadow("
<< language::enumValue("QFrame::Sunken"_L1)
<< language::enumValue("QFrame::Shadow::Sunken"_L1)
<< ')' << language::eol;
}
continue;

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

@ -76,8 +76,8 @@ public:
line = new QFrame(AddLinkDialog);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
verticalLayout->addWidget(line);

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

@ -103,8 +103,8 @@ public:
line = new QFrame(BookmarkDialog);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
horizontalLayout_3->addWidget(line);

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

@ -53,8 +53,8 @@ public:
line = new QFrame(FilterNameDialogClass);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
gridLayout->addWidget(line, 1, 0, 1, 3);

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

@ -83,8 +83,8 @@ public:
line = new QFrame(FormWindowSettings);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
gridLayout->addWidget(line, 5, 0, 1, 2);

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

@ -94,8 +94,8 @@ public:
line = new QFrame(InstallDialog);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
gridLayout->addWidget(line, 6, 0, 1, 5);

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

@ -109,8 +109,8 @@ public:
line = new QFrame(qdesigner_internal__NewActionDialog);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
verticalLayout->addWidget(line);

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

@ -129,8 +129,8 @@ public:
line = new QFrame(PreferencesDialog);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
vboxLayout->addWidget(line);

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

@ -450,8 +450,8 @@ public:
vboxLayout7->setContentsMargins(0, 0, 0, 0);
line1 = new QFrame(line1Widget);
line1->setObjectName("line1");
line1->setFrameShape(QFrame::HLine);
line1->setFrameShadow(QFrame::Sunken);
line1->setFrameShape(QFrame::Shape::HLine);
line1->setFrameShadow(QFrame::Shadow::Sunken);
vboxLayout7->addWidget(line1);
@ -463,8 +463,8 @@ public:
vboxLayout8->setContentsMargins(0, 0, 0, 0);
line2 = new QFrame(line2Widget);
line2->setObjectName("line2");
line2->setFrameShape(QFrame::HLine);
line2->setFrameShadow(QFrame::Sunken);
line2->setFrameShape(QFrame::Shape::HLine);
line2->setFrameShadow(QFrame::Shadow::Sunken);
vboxLayout8->addWidget(line2);

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

@ -227,8 +227,8 @@ public:
line = new QFrame(WateringConfigDialog);
line->setObjectName("line");
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
line->setFrameShape(QFrame::Shape::HLine);
line->setFrameShadow(QFrame::Shadow::Sunken);
vboxLayout->addWidget(line);