4 files changed, 95 insertions, 8 deletions
diff --git a/src/layouts/qquickgridlayoutengine_p.h b/src/layouts/qquickgridlayoutengine_p.h
index cebf168b6..ce7285bf2 100644
--- a/src/layouts/qquickgridlayoutengine_p.h
+++ b/src/layouts/qquickgridlayoutengine_p.h
@@ -107,8 +107,7 @@ public:
         const QRectF r = info ? rect.marginsRemoved(info->qMargins()) : rect;
         const QSizeF oldSize(m_item->width(), m_item->height());
         const QSizeF newSize = r.size();
-        QPointF topLeft(qCeil(r.x()), qCeil(r.y()));
-        m_item->setPosition(topLeft);
+        m_item->setPosition(r.topLeft());
         if (newSize == oldSize) {
             if (QQuickLayout *lay = qobject_cast<QQuickLayout *>(m_item)) {
                 if (lay->arrangementIsDirty())
@@ -130,7 +129,7 @@ private:
 
 class QQuickGridLayoutEngine : public QGridLayoutEngine {
 public:
-    QQuickGridLayoutEngine() : QGridLayoutEngine(Qt::AlignVCenter) { }
+    QQuickGridLayoutEngine() : QGridLayoutEngine(Qt::AlignVCenter, true /*snapToPixelGrid*/) { }
 
     int indexOf(QQuickItem *item) const {
         for (int i = 0; i < q_items.size(); ++i) {
diff --git a/src/layouts/qquicklayout.cpp b/src/layouts/qquicklayout.cpp
index 4a80beada..d812c1128 100644
--- a/src/layouts/qquicklayout.cpp
+++ b/src/layouts/qquicklayout.cpp
@@ -934,12 +934,12 @@ void QQuickLayout::effectiveSizeHints_helper(QQuickItem *item, QSizeF *cachedSiz
             Q_ASSERT(getter);
 
             if (info->isExtentExplicitlySet(Qt::Horizontal, (Qt::SizeHint)i))
-                cachedSizeHints[i].setWidth(qCeil((info->*getter)()));
+                cachedSizeHints[i].setWidth((info->*getter)());
 
             getter = verGetters.call[i];
             Q_ASSERT(getter);
             if (info->isExtentExplicitlySet(Qt::Vertical, (Qt::SizeHint)i))
-                cachedSizeHints[i].setHeight(qCeil((info->*getter)()));
+                cachedSizeHints[i].setHeight((info->*getter)());
         }
     }
 
diff --git a/tests/auto/controls/data/tst_gridlayout.qml b/tests/auto/controls/data/tst_gridlayout.qml
index 2c931a7b3..b6bbd7d9c 100644
--- a/tests/auto/controls/data/tst_gridlayout.qml
+++ b/tests/auto/controls/data/tst_gridlayout.qml
@@ -908,9 +908,9 @@ Item {
                     for (var i = 0; i < 2; ++i)
                         compare(visualGeom[i] % 1, 0)
 
-                    // verify that x,y is is inside idealGeom
-                    verify(visualGeom[0] >= idealGeom[0])
-                    verify(visualGeom[1] >= idealGeom[1])
+                    // verify that x,y is no more than one pixel from idealGeom
+                    fuzzyCompare(visualGeom[0], idealGeom[0], 1)
+                    fuzzyCompare(visualGeom[1], idealGeom[1], 1)
 
                     // verify that the visual size is no more than 1 pixel taller/wider than the ideal size.
                     verify(visualGeom[2] <= idealGeom[2] + 1)
diff --git a/tests/auto/controls/data/tst_rowlayout.qml b/tests/auto/controls/data/tst_rowlayout.qml
index 286200d18..a0a6b7398 100644
--- a/tests/auto/controls/data/tst_rowlayout.qml
+++ b/tests/auto/controls/data/tst_rowlayout.qml
@@ -675,6 +675,94 @@ Item {
             layout.destroy();
         }
 
+        Component {
+            id: test_distributeToPixelGrid_Component
+            RowLayout {
+                spacing: 0
+                Rectangle {
+                    color: 'red'
+                    Layout.minimumWidth: 10
+                    Layout.preferredWidth: 50
+                    Layout.maximumWidth: 90
+                    Layout.fillWidth: true
+                    implicitHeight: 10
+                }
+                Rectangle {
+                    color: 'red'
+                    Layout.minimumWidth: 10
+                    Layout.preferredWidth: 20
+                    Layout.maximumWidth: 90
+                    Layout.fillWidth: true
+                    implicitHeight: 10
+                }
+                Rectangle {
+                    color: 'red'
+                    Layout.minimumWidth: 10
+                    Layout.preferredWidth: 70
+                    Layout.maximumWidth: 90
+                    Layout.fillWidth: true
+                    implicitHeight: 10
+                }
+            }
+        }
+
+        function test_distributeToPixelGrid_data() {
+            return [
+                    { tag: "narrow",  spacing: 0, width: 60 },
+                    { tag: "belowPreferred",  spacing: 0, width: 130 },
+                    { tag: "belowPreferredWithSpacing", spacing: 10, width: 130 },
+                    { tag: "abovePreferred",  spacing: 0, width: 150 },
+                    { tag: "stretchSomethingToMaximum",  spacing: 0, width: 240,
+                      expected: [90, 60, 90] },
+                    { tag: "minSizeHasFractions",  spacing: 2, width: 31 + 4, hints: [{min: 10+1/3}, {min: 10+1/3}, {min: 10+1/3}],
+                      /*expected: [11, 11, 11]*/ },     /* verify that nothing gets allocated a size smaller than its minimum */
+                    { tag: "maxSizeHasFractions",  spacing: 2, width: 271 + 4, hints: [{max: 90+1/3}, {max: 90+1/3}, {max: 90+1/3}],
+                      /*expected: [90, 90, 90]*/ },     /* verify that nothing gets allocated a size larger than its maximum */
+                    { tag: "fixedSizeHasFractions",  spacing: 2, width: 31 + 4, hints: [{min: 10+1/3, max: 10+1/3}, {min: 10+1/3, max: 10+1/3}, {min: 10+1/3, max: 10+1/3}],
+                      /*expected: [11, 11, 11]*/ },     /* verify that nothing gets allocated a size smaller than its minimum */
+                    ];
+        }
+
+        function test_distributeToPixelGrid(data)
+        {
+            // CONFIGURATION
+            var layout = test_distributeToPixelGrid_Component.createObject(container)
+            layout.spacing = data.spacing
+            layout.width  = data.width
+            layout.height = 10
+            var kids = layout.children
+
+            if (data.hasOwnProperty('hints')) {
+                var hints = data.hints
+                for (var i = 0; i < hints.length; ++i) {
+                    var h = hints[i]
+                    if (h.hasOwnProperty('min'))
+                        kids[i].Layout.minimumWidth = h.min
+                    if (h.hasOwnProperty('pref'))
+                        kids[i].Layout.preferredWidth = h.pref
+                    if (h.hasOwnProperty('max'))
+                        kids[i].Layout.maximumWidth = h.max
+                }
+            }
+            waitForRendering(layout)
+
+            var sum = 2 * layout.spacing
+            // TEST
+            for (var i = 0; i < kids.length; ++i) {
+                compare(kids[i].x % 1, 0)           // checks if position is a whole integer
+                // verify if the items are within the size constraints as specified
+                verify(kids[i].width >= kids[i].Layout.minimumWidth)
+                verify(kids[i].width <= kids[i].Layout.maximumWidth)
+                if (data.hasOwnProperty('expected'))
+                    compare(kids[i].width,  data.expected[i])
+                sum += kids[i].width
+            }
+            fuzzyCompare(sum, layout.width, 1)
+
+            layout.destroy();
+        }
+
+
 
         Component {
             id: layout_deleteLayout