Implement viewOptions() logic in QListViewPrivate.

The private method is called in several places in QListViewPrivate,
but before this patch, the implementation in QAbstractItemView was
 called. This meant that the options were not set properly,
resulting, for example, in icons in icon mode being laid out in
list mode (on the left and small).

This is a regression resulting from
8eab9cbce2014ffc6186dd6b6fb73da85956ee86 and
3578e05b293c1cc53582109001b20f02c7a1eeb7. Other views are not
affected in a similar way.

Change-Id: I753cb99410e367266753eaf2fa43361b9212ab96
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 22f1e2fe4e..d252d78624 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -141,6 +141,7 @@ private slots:
     void spacing_data();
     void spacing();
     void testScrollToWithHidden();
+    void testViewOptions();
 };
 
 // Testing get/set functions
@@ -910,6 +911,10 @@ class PublicListView : public QListView
     void setPositionForIndex(const QPoint &pos, const QModelIndex &index) {
         QListView::setPositionForIndex(pos, index);
     }
+
+    QStyleOptionViewItem viewOptions() const {
+      return QListView::viewOptions();
+    }
 };
 
 class TestDelegate : public QItemDelegate
@@ -2308,5 +2313,17 @@ void tst_QListView::testScrollToWithHidden()
     QCOMPARE(expectedScrollBarValue, lv.verticalScrollBar()->value());
 }
 
+
+
+void tst_QListView::testViewOptions()
+{
+    PublicListView view;
+    QStyleOptionViewItem options = view.viewOptions();
+    QCOMPARE(options.decorationPosition, QStyleOptionViewItem::Left);
+    view.setViewMode(QListView::IconMode);
+    options = view.viewOptions();
+    QCOMPARE(options.decorationPosition, QStyleOptionViewItem::Top);
+}
+
 QTEST_MAIN(tst_QListView)
 #include "tst_qlistview.moc"