QColumnView: didn't react to addition of rows/cols in the current view

Task-number: 246999

1 files changed, 35 insertions, 7 deletions

diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index 0216e0f..0b3ba7a 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <qstandarditemmodel.h>
+#include <qitemdelegate.h>
 #include <qcolumnview.h>
 #include "../../../src/gui/itemviews/qcolumnviewgrip_p.h"
 #include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
@@ -87,6 +88,8 @@ private slots:
     void setSelectionModel();
     void visualRegionForSelection();
 
+    void dynamicModelChanges();
+
     // grip
     void moveGrip_basic();
     void moveGrip_data();
@@ -133,16 +136,10 @@ public:
     inline QModelIndex thirdLevel() { return index(0, 0, secondLevel()); }
 };
 
-class ColumnViewPrivate : public QColumnViewPrivate
-{
-public:
-    ColumnViewPrivate() : QColumnViewPrivate() {}
-};
-
 class ColumnView : public QColumnView {
 
 public:
-    ColumnView(QWidget *parent = 0) : QColumnView(*new ColumnViewPrivate, parent){}
+    ColumnView(QWidget *parent = 0) : QColumnView(parent){}
 
     QList<QPointer<QAbstractItemView> > createdColumns;
     void ScrollContentsBy(int x, int y) {scrollContentsBy(x,y); }
@@ -1002,6 +999,37 @@ void tst_QColumnView::pullRug()
     // don't crash
 }
 
+void tst_QColumnView::dynamicModelChanges()
+{
+    struct MyItemDelegate : public QItemDelegate
+    {
+        void paint(QPainter *painter,
+                   const QStyleOptionViewItem &option,
+                   const QModelIndex &index) const
+        {
+            paintedIndexes += index;
+            QItemDelegate::paint(painter, option, index);
+        }
+
+        mutable QSet<QModelIndex> paintedIndexes;
+
+    } delegate;;
+    QStandardItemModel model;
+    ColumnView view;
+    view.setModel(&model);
+    view.setItemDelegate(&delegate);
+    view.show();
+
+    QStandardItem *item = new QStandardItem(QLatin1String("item"));
+    model.appendRow(item);
+
+    QTest::qWait(200); //let the time for painting to occur
+    QCOMPARE(delegate.paintedIndexes.count(), 1);
+    QCOMPARE(*delegate.paintedIndexes.begin(), model.index(0,0));
+
+
+}
+
 
 QTEST_MAIN(tst_QColumnView)
 #include "tst_qcolumnview.moc"