Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/widgets/widgets/qpushbutton.cpp

Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81

1 files changed, 0 insertions, 24 deletions

diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 29e4bbfe29..a89f8f3c8a 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -150,7 +150,6 @@ private slots:
     void horizontalScrollingByVerticalWheelEvents();
     void taskQTBUG_7232_AllowUserToControlSingleStep();
     void taskQTBUG_51086_skippingIndexesInSelectedIndexes();
-    void expandingListItems();
     void taskQTBUG_47694_indexOutOfBoundBatchLayout();
 };
 
@@ -2488,29 +2487,6 @@ void tst_QListView::taskQTBUG_51086_skippingIndexesInSelectedIndexes()
     QVERIFY(!indexes.contains(data.index(8, 0)));
 }
 
-void tst_QListView::expandingListItems()
-{
-    auto item1 = new QStandardItem("111");
-    auto item2 = new QStandardItem("111111");
-    QStandardItemModel model;
-    model.appendRow(item1);
-    model.appendRow(item2);
-
-    QListView w;
-    w.setModel(&model);
-    w.setWrapping(true);
-    w.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&w));
-
-    QVERIFY(w.visualRect(item1->index()).width() > 0);
-    QVERIFY(w.visualRect(item1->index()).width() == w.visualRect(item2->index()).width());
-
-    w.setExpandingListItems(false);
-    QApplication::processEvents();
-
-    QVERIFY(w.visualRect(item1->index()).width() < w.visualRect(item2->index()).width());
-}
-
 void tst_QListView::taskQTBUG_47694_indexOutOfBoundBatchLayout()
 {
     QListView view;