Fix Column/Row size when no items being positioned

Change-Id: I0bf55c13e55856dd7292e5eda159086096dea86b
Reviewed-on: http://codereview.qt.nokia.com/2158
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/src/declarative/items/qsgpositioners.cpp b/src/declarative/items/qsgpositioners.cpp
index 3f6b24a8d4..da3c7fea04 100644
--- a/src/declarative/items/qsgpositioners.cpp
+++ b/src/declarative/items/qsgpositioners.cpp
@@ -211,7 +211,7 @@ void QSGBasePositioner::prePositioning()
             positionedItems.append(*item);
         }
     }
-    QSizeF contentSize;
+    QSizeF contentSize(0,0);
     doPositioning(&contentSize);
     if(d->addTransition || d->moveTransition)
         finishApplyTransitions();
@@ -288,10 +288,11 @@ void QSGColumn::doPositioning(QSizeF *contentSize)
         contentSize->setWidth(qMax(contentSize->width(), child.item->width()));
 
         voffset += child.item->height();
-        voffset += spacing();
+        if (ii != positionedItems.count() - 1)
+            voffset += spacing();
     }
 
-    contentSize->setHeight(voffset - spacing());
+    contentSize->setHeight(voffset);
 }
 
 void QSGColumn::reportConflictingAnchors()
@@ -370,10 +371,11 @@ void QSGRow::doPositioning(QSizeF *contentSize)
         contentSize->setHeight(qMax(contentSize->height(), child.item->height()));
 
         hoffset += child.item->width();
-        hoffset += spacing();
+        if (ii != positionedItems.count() - 1)
+            hoffset += spacing();
     }
 
-    contentSize->setWidth(hoffset - spacing());
+    contentSize->setWidth(hoffset);
 
     if (d->isLeftToRight())
         return;