2 files changed, 71 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickgridview/data/qtbug92998.qml b/tests/auto/quick/qquickgridview/data/qtbug92998.qml
new file mode 100644
index 0000000000..204e6d0b87
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/qtbug92998.qml
@@ -0,0 +1,52 @@
+import QtQuick 2.0
+
+Item {
+    width: 450
+    height: 650
+    GridView {
+        objectName: "gridview"
+        id: gridView
+        width: 450
+        height: 650
+        layoutDirection: Qt.RightToLeft
+        property int cells: calcCells(width)
+        cellWidth: width / cells
+        cellHeight: cellWidth
+
+        delegate: Component {
+            Item {
+                width: gridView.cellWidth
+                height: gridView.cellHeight
+                Rectangle {
+                    anchors {
+                        fill: parent
+                        margins: 10
+                    }
+                    color: "green"
+                }
+            }
+        }
+        model: [
+           { number: "1" },
+           { number: "2" },
+           { number: "3" },
+           { number: "4" },
+           { number: "5" },
+           { number: "6" },
+           { number: "7" },
+           { number: "8" },
+           { number: "9" },
+           { number: "10" },
+           { number: "11" },
+           { number: "12" },
+           { number: "13" },
+           { number: "14" },
+           { number: "15" },
+           { number: "16" }];
+        function calcCells(w) {
+            var rw = 120;
+            var c = Math.max(1, Math.round(w / rw));
+            return c;
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 46e3457d6e..94ec4f44d5 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -215,6 +215,7 @@ private slots:
     void QTBUG_48870_fastModelUpdates();
 
     void keyNavigationEnabled();
+    void resizeDynamicCellWidthRtL();
     void releaseItems();
 
 private:
@@ -6795,6 +6796,24 @@ void tst_QQuickGridView::QTBUG_48870_fastModelUpdates()
     }
 }
 
+void tst_QQuickGridView::resizeDynamicCellWidthRtL()
+{
+    QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("qtbug92998.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "gridview");
+    QTRY_VERIFY(gridview != nullptr);
+    QVERIFY(QQuickTest::qWaitForItemPolished(gridview));
+    gridview->setWidth(460);
+    QVERIFY(QQuickTest::qWaitForItemPolished(gridview));
+    QTRY_COMPARE(gridview->contentX(), 0.f);
+    gridview->setWidth(360);
+    QVERIFY(QQuickTest::qWaitForItemPolished(gridview));
+    QTRY_COMPARE(gridview->contentX(), 0.f);
+}
+
 void tst_QQuickGridView::releaseItems()
 {
     QScopedPointer<QQuickView> view(createView());