From d6910f12cdaac746b0b336cb0d8b9b4ea830e9e2 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Mon, 1 Mar 2010 16:57:30 +0100
Subject: Fix crash using openPersistentEditor and setRowHidden on a QTableView

Hiding widget might result in focus changes that will modify the list
of editors while iterating over it.

Same fixe as in commit 386726f7184cc77f0692e2ba24d85ebc53a39569

The test comes from the Task

Task-number: QTBUG-8585
Reviewed-by: Thierry
---
 src/gui/itemviews/qabstractitemview.cpp  |  8 ++++--
 tests/auto/qtableview/tst_qtableview.cpp | 46 ++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 4931b46..2faf755 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -2568,6 +2568,7 @@ void QAbstractItemView::updateEditorGeometries()
     QStyleOptionViewItemV4 option = d->viewOptionsV4();
     QList<QEditorInfo>::iterator it = d->editors.begin();
     QWidgetList editorsToRelease;
+    QWidgetList editorsToHide;
     while (it != d->editors.end()) {
         QModelIndex index = it->index;
         QWidget *editor = it->editor;
@@ -2579,7 +2580,7 @@ void QAbstractItemView::updateEditorGeometries()
                 if (delegate)
                     delegate->updateEditorGeometry(editor, option, index);
             } else {
-                editor->hide();
+                editorsToHide << editor;
             }
             ++it;
         } else {
@@ -2588,8 +2589,11 @@ void QAbstractItemView::updateEditorGeometries()
         }
     }
 
-    //we release the editor outside of the loop because it might change the focus and try
+    //we hide and release the editor outside of the loop because it might change the focus and try
     //to change the d->editors list.
+    for (int i = 0; i < editorsToHide.count(); ++i) {
+        editorsToHide.at(i)->hide();
+    }
     for (int i = 0; i < editorsToRelease.count(); ++i) {
         d->releaseEditor(editorsToRelease.at(i));
     }
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 430712c..a5cbbd4 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -199,6 +199,7 @@ private slots:
     void taskQTBUG_5062_spansInconsistency();
     void taskQTBUG_4516_clickOnRichTextLabel();
     void taskQTBUG_5237_wheelEventOnHeader();
+    void taskQTBUG_8585_crashForNoGoodReason();
 
     void mouseWheel_data();
     void mouseWheel();
@@ -3948,5 +3949,50 @@ void tst_QTableView::taskQTBUG_5237_wheelEventOnHeader()
     QVERIFY(sbValueBefore != sbValueAfter);
 }
 
+class TestTableView : public QTableView {
+Q_OBJECT
+public:
+    TestTableView(QWidget *parent = 0) : QTableView(parent)
+    {
+        connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(openEditor(const QModelIndex&)));
+    }
+    ~TestTableView(){}
+public slots:
+    void onDataChanged()
+    {
+        for (int i = 0; i < model()->rowCount(); i++) {
+            setRowHidden(i, model()->data(model()->index(i, 0)).toBool());
+        }
+    }
+
+    void openEditor(const QModelIndex& index)
+    { openPersistentEditor(index); }
+};
+
+
+void tst_QTableView::taskQTBUG_8585_crashForNoGoodReason()
+{
+    QStandardItemModel model;
+    model.insertColumn(0, QModelIndex());
+    for(int i = 0; i < 20; i++)
+    {
+        model.insertRow(i);
+    }
+
+    TestTableView w;
+    w.setMouseTracking(true);
+    w.setModel(&model);
+    connect(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), &w, SLOT(onDataChanged()));
+    w.show();
+    QTest::qWaitForWindowShown(&w);
+    for (int i = 0; i < 10; i++)
+    {
+        QTest::mouseMove(w.viewport(), QPoint(50, 20));
+        w.model()->setData(w.indexAt(QPoint(50, 20)), true);
+        QTest::mouseMove(w.viewport(), QPoint(50, 25));
+    }
+}
+
+
 QTEST_MAIN(tst_QTableView)
 #include "tst_qtableview.moc"
-- 
cgit v0.12