1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uic: Handle horizontal and vertical layout size constraints (Qt 7)

Browse Source 
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 <richard.gustavsen@qt.io>
This commit is contained in:
Friedemann Kleint 2025-05-07 13:19:03 +02:00
parent ee04a324ce
commit 977b6daa92
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,6 +232,9 @@ namespace {
qWarning("%s", qPrintable(msg)); qWarning("%s", qPrintable(msg));
return false; return false;
} }
// Qt 7 separate layout size constraints (QTBUG-17730)
if (name == "verticalSizeConstraint"_L1 && className.contains("Layout"_L1))
return false;
break; break;
case DomProperty::IconSet: case DomProperty::IconSet:
if (const DomResourceIcon *dri = p->elementIconSet()) { 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)) if (!checkProperty(m_uic->customWidgetsInfo(), m_option.inputFile, className, p))
continue; continue;
QString propertyName = p->attributeName(); 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; QString propertyValue;
bool delayProperty = false; bool delayProperty = false;