Some fixes related to row/column Spacing

* API: set{Horizontal,Vertical}Spacing -> set{Column,Row}Spacing
* Fixed a bug where setRowSpacing actually modified the column spacing.
* The ctor now set the spacings of both row and column in one go.

Change-Id: Ic5c5921f6f4e38edaeafdf911a2f14fbc7d496f8
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

2 files changed, 9 insertions, 10 deletions

diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp
index d098a6c45..a0cb63356 100644
--- a/src/layouts/qquicklinearlayout.cpp
+++ b/src/layouts/qquicklinearlayout.cpp
@@ -341,8 +341,7 @@ QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = 0*/)
     Q_D(QQuickGridLayout);
     d->columnSpacing = q_declarativeLayoutDefaultSpacing;
     d->rowSpacing = q_declarativeLayoutDefaultSpacing;
-    d->engine.setSpacing(d->columnSpacing, Qt::Horizontal);
-    d->engine.setSpacing(d->rowSpacing, Qt::Vertical);
+    d->engine.setSpacing(q_declarativeLayoutDefaultSpacing, Qt::Horizontal | Qt::Vertical);
 }
 
 qreal QQuickGridLayout::columnSpacing() const
@@ -351,14 +350,14 @@ qreal QQuickGridLayout::columnSpacing() const
     return d->columnSpacing;
 }
 
-void QQuickGridLayout::setHorizontalSpacing(qreal spacing)
+void QQuickGridLayout::setColumnSpacing(qreal spacing)
 {
     Q_D(QQuickGridLayout);
     if (qIsNaN(spacing) || d->columnSpacing == spacing)
         return;
 
     d->columnSpacing = spacing;
-    d->engine.setSpacing(spacing, Qt::Horizontal | Qt::Vertical);
+    d->engine.setSpacing(spacing, Qt::Horizontal);
     invalidate();
 }
 
@@ -368,14 +367,14 @@ qreal QQuickGridLayout::rowSpacing() const
     return d->rowSpacing;
 }
 
-void QQuickGridLayout::setVerticalSpacing(qreal spacing)
+void QQuickGridLayout::setRowSpacing(qreal spacing)
 {
     Q_D(QQuickGridLayout);
     if (qIsNaN(spacing) || d->rowSpacing == spacing)
         return;
 
     d->rowSpacing = spacing;
-    d->engine.setSpacing(spacing, Qt::Horizontal | Qt::Vertical);
+    d->engine.setSpacing(spacing, Qt::Vertical);
     invalidate();
 }
 
diff --git a/src/layouts/qquicklinearlayout_p.h b/src/layouts/qquicklinearlayout_p.h
index 04b3b3001..a4773d048 100644
--- a/src/layouts/qquicklinearlayout_p.h
+++ b/src/layouts/qquicklinearlayout_p.h
@@ -109,14 +109,14 @@ class QQuickGridLayoutPrivate;
 class QQuickGridLayout : public QQuickGridLayoutBase
 {
     Q_OBJECT
-    Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setHorizontalSpacing NOTIFY columnSpacingChanged)
-    Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setVerticalSpacing NOTIFY rowSpacingChanged)
+    Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
+    Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
 public:
     explicit QQuickGridLayout(QQuickItem *parent = 0);
     qreal columnSpacing() const;
-    void setHorizontalSpacing(qreal spacing);
+    void setColumnSpacing(qreal spacing);
     qreal rowSpacing() const;
-    void setVerticalSpacing(qreal spacing);
+    void setRowSpacing(qreal spacing);
 signals:
     void columnSpacingChanged();
     void rowSpacingChanged();