diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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; |