1 files changed, 24 insertions, 5 deletions
diff --git a/src/quicklayouts/qquicklinearlayout_p.h b/src/quicklayouts/qquicklinearlayout_p.h
index a29106e8a2..b3b692d13d 100644
--- a/src/quicklayouts/qquicklinearlayout_p.h
+++ b/src/quicklayouts/qquicklinearlayout_p.h
@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
  **/
 class QQuickGridLayoutBasePrivate;
 
-class Q_QUICKLAYOUTS_PRIVATE_EXPORT QQuickGridLayoutBase : public QQuickLayout
+class Q_QUICKLAYOUTS_EXPORT QQuickGridLayoutBase : public QQuickLayout
 {
     Q_OBJECT
 
@@ -111,7 +111,7 @@ public:
  **
  **/
 class QQuickGridLayoutPrivate;
-class Q_QUICKLAYOUTS_PRIVATE_EXPORT QQuickGridLayout : public QQuickGridLayoutBase
+class Q_QUICKLAYOUTS_EXPORT QQuickGridLayout : public QQuickGridLayoutBase
 {
     Q_OBJECT
 
@@ -120,6 +120,11 @@ class Q_QUICKLAYOUTS_PRIVATE_EXPORT QQuickGridLayout : public QQuickGridLayoutBa
     Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged)
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
+    Q_PROPERTY(bool uniformCellWidths READ uniformCellWidths WRITE setUniformCellWidths
+               NOTIFY uniformCellWidthsChanged REVISION(6, 6) FINAL)
+    Q_PROPERTY(bool uniformCellHeights READ uniformCellHeights WRITE setUniformCellHeights
+               NOTIFY uniformCellHeightsChanged REVISION(6, 6) FINAL)
+
     QML_NAMED_ELEMENT(GridLayout)
     QML_ADDED_IN_VERSION(1, 0)
 public:
@@ -139,6 +144,11 @@ public:
     Flow flow() const;
     void setFlow(Flow flow);
 
+    bool uniformCellWidths() const;
+    void setUniformCellWidths(bool uniformCellWidths);
+    bool uniformCellHeights() const;
+    void setUniformCellHeights(bool uniformCellHeights);
+
     void insertLayoutItems() override;
 
 Q_SIGNALS:
@@ -149,6 +159,9 @@ Q_SIGNALS:
     void rowsChanged();
 
     void flowChanged();
+
+    Q_REVISION(6, 6) void uniformCellWidthsChanged();
+    Q_REVISION(6, 6) void uniformCellHeightsChanged();
 private:
     Q_DECLARE_PRIVATE(QQuickGridLayout)
 };
@@ -170,21 +183,27 @@ public:
  **
  **/
 class QQuickLinearLayoutPrivate;
-class Q_QUICKLAYOUTS_PRIVATE_EXPORT QQuickLinearLayout : public QQuickGridLayoutBase
+class Q_QUICKLAYOUTS_EXPORT QQuickLinearLayout : public QQuickGridLayoutBase
 {
     Q_OBJECT
+    QML_ANONYMOUS
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+    Q_PROPERTY(bool uniformCellSizes READ uniformCellSizes WRITE setUniformCellSizes
+               NOTIFY uniformCellSizesChanged REVISION(6, 6) FINAL)
 public:
     explicit QQuickLinearLayout(Qt::Orientation orientation,
                                 QQuickItem *parent = nullptr);
     void insertLayoutItem(QQuickItem *item);
     qreal spacing() const;
     void setSpacing(qreal spacing);
+    bool uniformCellSizes() const;
+    void setUniformCellSizes(bool uniformCellSizes);
 
     void insertLayoutItems() override;
 
 Q_SIGNALS:
     void spacingChanged();
+    Q_REVISION(6, 6) void uniformCellSizesChanged();
 private:
     Q_DECLARE_PRIVATE(QQuickLinearLayout)
 };
@@ -202,7 +221,7 @@ public:
  ** QQuickRowLayout
  **
  **/
-class Q_QUICKLAYOUTS_PRIVATE_EXPORT  QQuickRowLayout : public QQuickLinearLayout
+class Q_QUICKLAYOUTS_EXPORT  QQuickRowLayout : public QQuickLinearLayout
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(RowLayout)
@@ -219,7 +238,7 @@ public:
  ** QQuickColumnLayout
  **
  **/
-class Q_QUICKLAYOUTS_PRIVATE_EXPORT QQuickColumnLayout : public QQuickLinearLayout
+class Q_QUICKLAYOUTS_EXPORT QQuickColumnLayout : public QQuickLinearLayout
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(ColumnLayout)