From 2e82796022b9eaeeb3a231713603c39ae7b2099d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 19 Oct 2023 13:50:53 +0200 Subject: uic: Prepare for encountering fully qualified enum values in new .ui files 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 --- tests/auto/tools/uic/baseline/downloaditem.ui.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/tools/uic/baseline/downloaditem.ui.h') diff --git a/tests/auto/tools/uic/baseline/downloaditem.ui.h b/tests/auto/tools/uic/baseline/downloaditem.ui.h index 34ad00c48b..6698813fb6 100644 --- a/tests/auto/tools/uic/baseline/downloaditem.ui.h +++ b/tests/auto/tools/uic/baseline/downloaditem.ui.h @@ -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); -- cgit v1.2.3