1 files changed, 39 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
index e6e689336a..657a1ea55c 100644
--- a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
+++ b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
@@ -32,6 +32,8 @@
 #include <qcoreapplication.h>
 #include <qdebug.h>
 #include <qfocusframe.h>
+#include <qtableview.h>
+#include <qstandarditemmodel.h>
 
 class tst_QFocusFrame : public QObject
 {
@@ -43,6 +45,7 @@ public:
 
 private slots:
     void getSetCheck();
+    void focusFrameInsideScrollview();
 };
 
 tst_QFocusFrame::tst_QFocusFrame()
@@ -68,5 +71,41 @@ void tst_QFocusFrame::getSetCheck()
     delete obj1;
 }
 
+void tst_QFocusFrame::focusFrameInsideScrollview()
+{
+    // Make sure that the focus frame follows the widget, even
+    // if the widget is inside a QAbstractItemView. A QAbstractItemView will scroll
+    // all the children, including the focus frame, when it scrolls, which
+    // is why special considerations are taken inside the focus frame to
+    // prevent the frame to scroll away from the widget it tracks.
+
+    if (qApp->style()->objectName() != QLatin1String("macintosh"))
+        QSKIP("This test is only valid when using a style that has a focus frame");
+
+    QWidget window;
+    window.setGeometry(100, 100, 500, 500);
+
+    QTableView tableView(&window);
+    tableView.resize(window.size());
+    QStandardItemModel *itemModel = new QStandardItemModel();
+    for (int i = 0; i < 50; ++i)
+        itemModel->appendRow(new QStandardItem("Value"));
+    tableView.setModel(itemModel);
+    tableView.edit(itemModel->index(8, 0));
+
+    window.show();
+    QFocusFrame *focusFrame = nullptr;
+    QTRY_VERIFY(focusFrame = window.findChild<QFocusFrame *>());
+    const QPoint initialOffset = focusFrame->widget()->mapToGlobal(QPoint()) - focusFrame->mapToGlobal(QPoint());
+
+    tableView.scrollTo(itemModel->index(40, 0));
+    QPoint offsetAfterScroll = focusFrame->widget()->mapToGlobal(QPoint()) - focusFrame->mapToGlobal(QPoint());
+    QCOMPARE(offsetAfterScroll, initialOffset);
+
+    tableView.scrollTo(itemModel->index(0, 0));
+    offsetAfterScroll = focusFrame->widget()->mapToGlobal(QPoint()) - focusFrame->mapToGlobal(QPoint());
+    QCOMPARE(offsetAfterScroll, initialOffset);
+}
+
 QTEST_MAIN(tst_QFocusFrame)
 #include "tst_qfocusframe.moc"