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

Change-Id: I896b0cf54f317c4336cc3d3db319a0b89e421728

3 files changed, 1 insertions, 27 deletions

diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST
index 3e03d9e236..9108cf2c1f 100644
--- a/tests/auto/gui/kernel/qwindow/BLACKLIST
+++ b/tests/auto/gui/kernel/qwindow/BLACKLIST
@@ -15,6 +15,7 @@ ubuntu-14.04
 [modalWindowEnterEventOnHide_QTBUG35109]
 ubuntu-14.04
 ubuntu-16.04
+osx ci
 [modalDialogClosingOneOfTwoModal]
 osx
 [modalWindowModallity]
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 039d095ce6..f1c4f970cd 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -2029,9 +2029,6 @@ void tst_QWindow::modalWindowPosition()
 #ifndef QT_NO_CURSOR
 void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109()
 {
-    if (QGuiApplication::platformName() == QLatin1String("cocoa"))
-        QSKIP("This test fails on OS X on CI");
-
     if (isPlatformOffscreenOrMinimal())
         QSKIP("Can't test window focusing on offscreen/minimal");
 
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 4c6dd341b3..b2e1a2d9b5 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -332,17 +332,6 @@ public:
         endRemoveColumns();
     }
 
-    void removeAddLastColumnLayoutChanged()    // for taskQTBUG_41124
-    {
-        // make sure QHeaderView::_q_layoutChanged() is called
-        emit layoutAboutToBeChanged();
-        --cols;
-        emit layoutChanged();
-        emit layoutAboutToBeChanged();
-        ++cols;
-        emit layoutChanged();
-    }
-
     void removeAllColumns()
     {
         beginRemoveColumns(QModelIndex(), 0, cols - 1);
@@ -1337,19 +1326,6 @@ void tst_QTreeView::columnHidden()
     for (int c = 0; c < model.columnCount(); ++c)
         QCOMPARE(view.isColumnHidden(c), true);
     view.update();
-
-    // QTBUG_41124:
-    // QHeaderViewPrivate::_q_layoutChanged was not called because it was
-    // disconnected in QTreeView::setModel(). _q_layoutChanged restores
-    // the hidden sections which is tested here
-    view.setColumnHidden(model.cols - 1, true);
-    model.removeAddLastColumnLayoutChanged();
-    // we removed the last column and added a new one
-    // (with layoutToBeChanged/layoutChanged() for both) so column
-    // 1 is a new column and therefore must not be hidden when
-    // _q_layoutChanged() is called and is doing the right stuff
-    QCOMPARE(view.isColumnHidden(model.cols - 1), false);
-
 }
 
 void tst_QTreeView::rowHidden()