Qt Designer: Handle size constraint properties of older Qt versionsHEADdev

- When saving for older versions, use only the horizontal value
- When reading an older version, apply the value to both
  orientations

Task-number: QTBUG-17730
Change-Id: I3514ae0575368085344a3095c8025f66ee337167
Reviewed-by: Richard Moe Gustavsen <[email protected]>

2 files changed, 27 insertions, 2 deletions

diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 3e5bac7f5..adc8d27f6 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -495,7 +495,9 @@ void QDesignerResource::save(QIODevice *dev, QWidget *widget)
     // Do not write fully qualified enumerations for spacer/line orientations
     // and other enum/flag properties for older Qt versions since that breaks
     // older uic.
-    d->m_fullyQualifiedEnums = supportsQualifiedEnums(m_formWindow->core()->integration()->qtVersion());
+    const auto qtVersion = m_formWindow->core()->integration()->qtVersion();
+    d->m_fullyQualifiedEnums = supportsQualifiedEnums(qtVersion);
+    d->m_separateSizeConstraints = qtVersion >= QVersionNumber(7, 0, 0);
     QAbstractFormBuilder::save(dev, widget);
 }
 
@@ -1002,6 +1004,14 @@ void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &p
         const QString &propertyName = p->attributeName();
         if (propertyName == "numDigits"_L1 && o->inherits("QLCDNumber")) { // Deprecated in Qt 4, removed in Qt 5.
             applyProperty(o, p, u"digitCount"_s, sheet, dynamicSheet);
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) // Qt 6 reading Qt 7 forms
+        } else if (propertyName == "horizontalSizeConstraint"_L1 && o->inherits("QLayout")) {
+            applyProperty(o, p, u"sizeConstraint"_s, sheet, dynamicSheet);
+#else                                        // Qt 7 reading pre Qt 7 forms
+        } else if (propertyName == "sizeConstraint"_L1 && o->inherits("QLayout")) {
+            applyProperty(o, p, u"horizontalSizeConstraint"_s, sheet, dynamicSheet);
+            applyProperty(o, p, u"verticalSizeConstraint"_s, sheet, dynamicSheet);
+#endif
         } else {
             applyProperty(o, p, propertyName, sheet, dynamicSheet);
         }
@@ -1586,6 +1596,9 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const
     if (prop == "objectName"_L1 || prop == "spacerName"_L1)  // ### don't store the property objectName
         return false;
 
+    if (!d->m_separateSizeConstraints && prop == "verticalSizeConstraint"_L1) // 7.0
+        return false;
+
     QWidget *check_widget = nullptr;
     if (obj->isWidgetType())
         check_widget = static_cast<QWidget*>(obj);
@@ -2029,7 +2042,13 @@ DomProperty *QDesignerResource::createProperty(QObject *object, const QString &p
         // check if we have a standard cpp set function
         if (!hasSetter(core(), object, propertyName))
             p->setAttributeStdset(0);
-        p->setAttributeName(propertyName);
+        // Map "horizontalSizeConstraint" to "sizeConstraint" for Qt 6
+        if (!d->m_separateSizeConstraints && propertyName == "horizontalSizeConstraint"_L1
+            && object->inherits("QLayout")) {
+            p->setAttributeName("sizeConstraint"_L1);
+        } else {
+            p->setAttributeName(propertyName);
+        }
         p->setElementEnum(id);
         return applyProperStdSetAttribute(object, propertyName, p);
     }
diff --git a/src/designer/src/lib/uilib/formbuilderextra_p.h b/src/designer/src/lib/uilib/formbuilderextra_p.h
index eda716d17..8f3c4103f 100644
--- a/src/designer/src/lib/uilib/formbuilderextra_p.h
+++ b/src/designer/src/lib/uilib/formbuilderextra_p.h
@@ -160,6 +160,12 @@ public:
     QHash<QString, QAction*> m_actions;
     QHash<QString, QActionGroup*> m_actionGroups;
     bool m_fullyQualifiedEnums = true;
+    // separate horizontal/vertical size constraints since Qt 7 (QTBUG-17730).
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+    bool m_separateSizeConstraints = false;
+#else
+    bool m_separateSizeConstraints = true;
+#endif
     int m_defaultMargin;
     int m_defaultSpacing;
     QDir m_workingDirectory;