From 977b6daa92309e73493e996330bee4d65061a8dc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 7 May 2025 13:19:03 +0200 Subject: [PATCH] uic: Handle horizontal and vertical layout size constraints (Qt 7) Ignore vertical constraint and use the horizontal one for the property. Task-number: QTBUG-17730 Pick-to: 6.9 6.8 Change-Id: I6317ce8c1c1e2ac2bf6ae3b24a60735a72dcb7bc Reviewed-by: Richard Moe Gustavsen --- src/tools/uic/cpp/cppwriteinitialization.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index eb5e3add2cd..b011f7063c2 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -232,6 +232,9 @@ namespace { qWarning("%s", qPrintable(msg)); return false; } + // Qt 7 separate layout size constraints (QTBUG-17730) + if (name == "verticalSizeConstraint"_L1 && className.contains("Layout"_L1)) + return false; break; case DomProperty::IconSet: if (const DomResourceIcon *dri = p->elementIconSet()) { @@ -1331,6 +1334,9 @@ void WriteInitialization::writeProperties(const QString &varName, if (!checkProperty(m_uic->customWidgetsInfo(), m_option.inputFile, className, p)) continue; QString propertyName = p->attributeName(); + // Qt 7 separate layout size constraints (QTBUG-17730) + if (propertyName == "horizontalSizeConstraint"_L1 && className.contains("Layout"_L1)) + propertyName = "sizeConstraint"_L1; QString propertyValue; bool delayProperty = false;