uic: Generate fully qualified enumerations for QFormLayout

This is required for Python.

Pick-to: 6.9
Task-number: PYSIDE-1735
Change-Id: I92108009dd23565adaa2ee77300059cb197a89c5
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
Reviewed-by: Shyamnath Premnadh <[email protected]>

9 files changed, 51 insertions, 50 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 5600c549bf7..03c4856e56e 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1104,8 +1104,9 @@ void WriteInitialization::acceptSpacer(DomSpacer *node)
 static inline QString formLayoutRole(int column, int colspan)
 {
     if (colspan > 1)
-        return "QFormLayout::SpanningRole"_L1;
-    return column == 0 ? "QFormLayout::LabelRole"_L1 : "QFormLayout::FieldRole"_L1;
+        return "QFormLayout::ItemRole::SpanningRole"_L1;
+    return column == 0
+        ? "QFormLayout::ItemRole::LabelRole"_L1 : "QFormLayout::ItemRole::FieldRole"_L1;
 }
 
 static QString layoutAddMethod(DomLayoutItem::Kind kind, const QString &layoutClass)
diff --git a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
index 70c1fc36b7f..7c16a9be0c9 100644
--- a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
@@ -49,23 +49,23 @@ public:
         label = new QLabel(AddLinkDialog);
         label->setObjectName("label");
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label);
 
         titleInput = new QLineEdit(AddLinkDialog);
         titleInput->setObjectName("titleInput");
         titleInput->setMinimumSize(QSize(337, 0));
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, titleInput);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, titleInput);
 
         label_2 = new QLabel(AddLinkDialog);
         label_2->setObjectName("label_2");
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, label_2);
 
         urlInput = new QLineEdit(AddLinkDialog);
         urlInput->setObjectName("urlInput");
 
-        formLayout->setWidget(1, QFormLayout::FieldRole, urlInput);
+        formLayout->setWidget(1, QFormLayout::ItemRole::FieldRole, urlInput);
 
 
         verticalLayout->addLayout(formLayout);
diff --git a/tests/auto/tools/uic/baseline/bookwindow.ui.h b/tests/auto/tools/uic/baseline/bookwindow.ui.h
index c484a051b85..b7c4af9f4a5 100644
--- a/tests/auto/tools/uic/baseline/bookwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/bookwindow.ui.h
@@ -84,40 +84,40 @@ public:
         label_5 = new QLabel(groupBox_2);
         label_5->setObjectName("label_5");
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label_5);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label_5);
 
         titleEdit = new QLineEdit(groupBox_2);
         titleEdit->setObjectName("titleEdit");
         titleEdit->setEnabled(true);
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, titleEdit);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, titleEdit);
 
         label_2_2_2_2 = new QLabel(groupBox_2);
         label_2_2_2_2->setObjectName("label_2_2_2_2");
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, label_2_2_2_2);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, label_2_2_2_2);
 
         authorEdit = new QComboBox(groupBox_2);
         authorEdit->setObjectName("authorEdit");
         authorEdit->setEnabled(true);
 
-        formLayout->setWidget(1, QFormLayout::FieldRole, authorEdit);
+        formLayout->setWidget(1, QFormLayout::ItemRole::FieldRole, authorEdit);
 
         label_3 = new QLabel(groupBox_2);
         label_3->setObjectName("label_3");
 
-        formLayout->setWidget(2, QFormLayout::LabelRole, label_3);
+        formLayout->setWidget(2, QFormLayout::ItemRole::LabelRole, label_3);
 
         genreEdit = new QComboBox(groupBox_2);
         genreEdit->setObjectName("genreEdit");
         genreEdit->setEnabled(true);
 
-        formLayout->setWidget(2, QFormLayout::FieldRole, genreEdit);
+        formLayout->setWidget(2, QFormLayout::ItemRole::FieldRole, genreEdit);
 
         label_4 = new QLabel(groupBox_2);
         label_4->setObjectName("label_4");
 
-        formLayout->setWidget(3, QFormLayout::LabelRole, label_4);
+        formLayout->setWidget(3, QFormLayout::ItemRole::LabelRole, label_4);
 
         yearEdit = new QSpinBox(groupBox_2);
         yearEdit->setObjectName("yearEdit");
@@ -125,18 +125,18 @@ public:
         yearEdit->setMaximum(2100);
         yearEdit->setMinimum(-1000);
 
-        formLayout->setWidget(3, QFormLayout::FieldRole, yearEdit);
+        formLayout->setWidget(3, QFormLayout::ItemRole::FieldRole, yearEdit);
 
         label = new QLabel(groupBox_2);
         label->setObjectName("label");
 
-        formLayout->setWidget(4, QFormLayout::LabelRole, label);
+        formLayout->setWidget(4, QFormLayout::ItemRole::LabelRole, label);
 
         ratingEdit = new QSpinBox(groupBox_2);
         ratingEdit->setObjectName("ratingEdit");
         ratingEdit->setMaximum(5);
 
-        formLayout->setWidget(4, QFormLayout::FieldRole, ratingEdit);
+        formLayout->setWidget(4, QFormLayout::ItemRole::FieldRole, ratingEdit);
 
 
         vboxLayout1->addWidget(groupBox_2);
diff --git a/tests/auto/tools/uic/baseline/buttongroup.ui.h b/tests/auto/tools/uic/baseline/buttongroup.ui.h
index b6804de5527..acc136ec50c 100644
--- a/tests/auto/tools/uic/baseline/buttongroup.ui.h
+++ b/tests/auto/tools/uic/baseline/buttongroup.ui.h
@@ -118,7 +118,7 @@ public:
         label->setSizePolicy(sizePolicy2);
         label->setMinimumSize(QSize(0, 30));
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label);
 
         periodSpinBox = new QDoubleSpinBox(groupBox);
         periodSpinBox->setObjectName("periodSpinBox");
@@ -133,7 +133,7 @@ public:
         periodSpinBox->setSingleStep(0.100000000000000);
         periodSpinBox->setValue(-1.000000000000000);
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, periodSpinBox);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, periodSpinBox);
 
         amplitudeSpinBox = new QDoubleSpinBox(groupBox);
         amplitudeSpinBox->setObjectName("amplitudeSpinBox");
@@ -143,13 +143,13 @@ public:
         amplitudeSpinBox->setSingleStep(0.100000000000000);
         amplitudeSpinBox->setValue(-1.000000000000000);
 
-        formLayout->setWidget(2, QFormLayout::FieldRole, amplitudeSpinBox);
+        formLayout->setWidget(2, QFormLayout::ItemRole::FieldRole, amplitudeSpinBox);
 
         label_3 = new QLabel(groupBox);
         label_3->setObjectName("label_3");
         label_3->setMinimumSize(QSize(0, 30));
 
-        formLayout->setWidget(4, QFormLayout::LabelRole, label_3);
+        formLayout->setWidget(4, QFormLayout::ItemRole::LabelRole, label_3);
 
         overshootSpinBox = new QDoubleSpinBox(groupBox);
         overshootSpinBox->setObjectName("overshootSpinBox");
@@ -159,13 +159,13 @@ public:
         overshootSpinBox->setSingleStep(0.100000000000000);
         overshootSpinBox->setValue(-1.000000000000000);
 
-        formLayout->setWidget(4, QFormLayout::FieldRole, overshootSpinBox);
+        formLayout->setWidget(4, QFormLayout::ItemRole::FieldRole, overshootSpinBox);
 
         label_2 = new QLabel(groupBox);
         label_2->setObjectName("label_2");
         label_2->setMinimumSize(QSize(0, 30));
 
-        formLayout->setWidget(2, QFormLayout::LabelRole, label_2);
+        formLayout->setWidget(2, QFormLayout::ItemRole::LabelRole, label_2);
 
 
         verticalLayout->addWidget(groupBox);
diff --git a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
index 2188d8ebf1e..aadb9215ddc 100644
--- a/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
@@ -43,45 +43,45 @@ public:
         label = new QLabel(embeddedDialog);
         label->setObjectName("label");
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label);
 
         layoutDirection = new QComboBox(embeddedDialog);
         layoutDirection->addItem(QString());
         layoutDirection->addItem(QString());
         layoutDirection->setObjectName("layoutDirection");
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, layoutDirection);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, layoutDirection);
 
         label_2 = new QLabel(embeddedDialog);
         label_2->setObjectName("label_2");
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, label_2);
 
         fontComboBox = new QFontComboBox(embeddedDialog);
         fontComboBox->setObjectName("fontComboBox");
 
-        formLayout->setWidget(1, QFormLayout::FieldRole, fontComboBox);
+        formLayout->setWidget(1, QFormLayout::ItemRole::FieldRole, fontComboBox);
 
         label_3 = new QLabel(embeddedDialog);
         label_3->setObjectName("label_3");
 
-        formLayout->setWidget(2, QFormLayout::LabelRole, label_3);
+        formLayout->setWidget(2, QFormLayout::ItemRole::LabelRole, label_3);
 
         style = new QComboBox(embeddedDialog);
         style->setObjectName("style");
 
-        formLayout->setWidget(2, QFormLayout::FieldRole, style);
+        formLayout->setWidget(2, QFormLayout::ItemRole::FieldRole, style);
 
         label_4 = new QLabel(embeddedDialog);
         label_4->setObjectName("label_4");
 
-        formLayout->setWidget(3, QFormLayout::LabelRole, label_4);
+        formLayout->setWidget(3, QFormLayout::ItemRole::LabelRole, label_4);
 
         spacing = new QSlider(embeddedDialog);
         spacing->setObjectName("spacing");
         spacing->setOrientation(Qt::Horizontal);
 
-        formLayout->setWidget(3, QFormLayout::FieldRole, spacing);
+        formLayout->setWidget(3, QFormLayout::ItemRole::FieldRole, spacing);
 
 #if QT_CONFIG(shortcut)
         label->setBuddy(layoutDirection);
diff --git a/tests/auto/tools/uic/baseline/newactiondialog.ui.h b/tests/auto/tools/uic/baseline/newactiondialog.ui.h
index 3f1fe13998f..8261bcde423 100644
--- a/tests/auto/tools/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newactiondialog.ui.h
@@ -63,28 +63,28 @@ public:
         label = new QLabel(qdesigner_internal__NewActionDialog);
         label->setObjectName("label");
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label);
 
         editActionText = new QLineEdit(qdesigner_internal__NewActionDialog);
         editActionText->setObjectName("editActionText");
         editActionText->setMinimumSize(QSize(255, 0));
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, editActionText);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, editActionText);
 
         label_3 = new QLabel(qdesigner_internal__NewActionDialog);
         label_3->setObjectName("label_3");
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, label_3);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, label_3);
 
         editObjectName = new QLineEdit(qdesigner_internal__NewActionDialog);
         editObjectName->setObjectName("editObjectName");
 
-        formLayout->setWidget(1, QFormLayout::FieldRole, editObjectName);
+        formLayout->setWidget(1, QFormLayout::ItemRole::FieldRole, editObjectName);
 
         label_2 = new QLabel(qdesigner_internal__NewActionDialog);
         label_2->setObjectName("label_2");
 
-        formLayout->setWidget(2, QFormLayout::LabelRole, label_2);
+        formLayout->setWidget(2, QFormLayout::ItemRole::LabelRole, label_2);
 
         horizontalLayout = new QHBoxLayout();
         horizontalLayout->setObjectName("horizontalLayout");
@@ -98,7 +98,7 @@ public:
         horizontalLayout->addItem(spacerItem);
 
 
-        formLayout->setLayout(2, QFormLayout::FieldRole, horizontalLayout);
+        formLayout->setLayout(2, QFormLayout::ItemRole::FieldRole, horizontalLayout);
 
 
         verticalLayout->addLayout(formLayout);
diff --git a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
index e81adac6446..8b80209fd54 100644
--- a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
@@ -53,7 +53,7 @@ public:
         m_lineEdit->setObjectName("m_lineEdit");
         m_lineEdit->setMinimumSize(QSize(220, 0));
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, m_lineEdit);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, m_lineEdit);
 
         label = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
         label->setObjectName("label");
@@ -63,7 +63,7 @@ public:
         sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
         label->setSizePolicy(sizePolicy);
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label);
 
         horizontalLayout = new QHBoxLayout();
         horizontalLayout->setObjectName("horizontalLayout");
@@ -77,14 +77,14 @@ public:
         horizontalLayout->addItem(horizontalSpacer);
 
 
-        formLayout->setLayout(1, QFormLayout::FieldRole, horizontalLayout);
+        formLayout->setLayout(1, QFormLayout::ItemRole::FieldRole, horizontalLayout);
 
         label_2 = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
         label_2->setObjectName("label_2");
         sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
         label_2->setSizePolicy(sizePolicy);
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, label_2);
 
 
         verticalLayout->addLayout(formLayout);
diff --git a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
index c7e54fde1ad..ea8a57745c6 100644
--- a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
@@ -47,17 +47,17 @@ public:
         m_styleLabel = new QLabel(PreviewConfigurationWidget);
         m_styleLabel->setObjectName("m_styleLabel");
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, m_styleLabel);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, m_styleLabel);
 
         m_styleCombo = new QComboBox(PreviewConfigurationWidget);
         m_styleCombo->setObjectName("m_styleCombo");
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, m_styleCombo);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, m_styleCombo);
 
         m_appStyleSheetLabel = new QLabel(PreviewConfigurationWidget);
         m_appStyleSheetLabel->setObjectName("m_appStyleSheetLabel");
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, m_appStyleSheetLabel);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, m_appStyleSheetLabel);
 
         hboxLayout = new QHBoxLayout();
         hboxLayout->setObjectName("hboxLayout");
@@ -78,12 +78,12 @@ public:
         hboxLayout->addWidget(m_appStyleSheetClearButton);
 
 
-        formLayout->setLayout(1, QFormLayout::FieldRole, hboxLayout);
+        formLayout->setLayout(1, QFormLayout::ItemRole::FieldRole, hboxLayout);
 
         m_skinLabel = new QLabel(PreviewConfigurationWidget);
         m_skinLabel->setObjectName("m_skinLabel");
 
-        formLayout->setWidget(2, QFormLayout::LabelRole, m_skinLabel);
+        formLayout->setWidget(2, QFormLayout::ItemRole::LabelRole, m_skinLabel);
 
         hboxLayout1 = new QHBoxLayout();
         hboxLayout1->setObjectName("hboxLayout1");
@@ -98,7 +98,7 @@ public:
         hboxLayout1->addWidget(m_skinRemoveButton);
 
 
-        formLayout->setLayout(2, QFormLayout::FieldRole, hboxLayout1);
+        formLayout->setLayout(2, QFormLayout::ItemRole::FieldRole, hboxLayout1);
 
 
         retranslateUi(PreviewConfigurationWidget);
diff --git a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
index 7f2c46aa475..e271637ccf5 100644
--- a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
@@ -56,14 +56,14 @@ public:
         label->setFrameShadow(QFrame::Plain);
         label->setTextFormat(Qt::AutoText);
 
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+        formLayout->setWidget(0, QFormLayout::ItemRole::LabelRole, label);
 
         templateNameEdit = new QLineEdit(SaveFormAsTemplate);
         templateNameEdit->setObjectName("templateNameEdit");
         templateNameEdit->setMinimumSize(QSize(222, 0));
         templateNameEdit->setEchoMode(QLineEdit::Normal);
 
-        formLayout->setWidget(0, QFormLayout::FieldRole, templateNameEdit);
+        formLayout->setWidget(0, QFormLayout::ItemRole::FieldRole, templateNameEdit);
 
         label_2 = new QLabel(SaveFormAsTemplate);
         label_2->setObjectName("label_2");
@@ -71,12 +71,12 @@ public:
         label_2->setFrameShadow(QFrame::Plain);
         label_2->setTextFormat(Qt::AutoText);
 
-        formLayout->setWidget(1, QFormLayout::LabelRole, label_2);
+        formLayout->setWidget(1, QFormLayout::ItemRole::LabelRole, label_2);
 
         categoryCombo = new QComboBox(SaveFormAsTemplate);
         categoryCombo->setObjectName("categoryCombo");
 
-        formLayout->setWidget(1, QFormLayout::FieldRole, categoryCombo);
+        formLayout->setWidget(1, QFormLayout::ItemRole::FieldRole, categoryCombo);
 
 
         vboxLayout->addLayout(formLayout);