Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

13 files changed, 546 insertions, 164 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 45c86800d6..6f7dca86eb 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -502,11 +502,6 @@ void tst_QAbstractItemView::basic_tests(QAbstractItemView *view)
     view->commitData(0);
     view->editorDestroyed(0);
 
-    view->setHorizontalStepsPerItem(2);
-    view->horizontalStepsPerItem();
-    view->setVerticalStepsPerItem(2);
-    view->verticalStepsPerItem();
-
     // Will assert as it should
     // view->setIndexWidget(QModelIndex(), 0);
 
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index e51a915401..42258c85b9 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -255,11 +255,12 @@ protected:
     void calculateAndCheck(int cppline, const int precalced_comparedata[]);
     void testMinMaxSectionSize(bool stretchLastSection);
 
-    QWidget *topLevel;
-    QHeaderView *view;
-    QStandardItemModel *model;
-    QTableView *m_tableview;
-    bool m_using_reset_model;
+    QWidget *topLevel = nullptr;
+    QHeaderView *view = nullptr;
+    QStandardItemModel *model = nullptr;
+    QTableView *m_tableview = nullptr;
+    bool m_using_reset_model = false;
+    bool m_special_prepare = false;
     QElapsedTimer timer;
 };
 
@@ -444,7 +445,13 @@ tst_QHeaderView::tst_QHeaderView()
 
 void tst_QHeaderView::initTestCase()
 {
-    m_tableview = new QTableView();
+    m_tableview = new QTableView;
+    qDebug().noquote().nospace()
+            << "default min section size is "
+            << QString::number(m_tableview->verticalHeader()->minimumSectionSize())
+            << QLatin1Char('/')
+            << m_tableview->horizontalHeader()->minimumSectionSize()
+            << " (v/h)";
 }
 
 void tst_QHeaderView::cleanupTestCase()
@@ -616,6 +623,27 @@ void tst_QHeaderView::hidden()
     view->setSectionHidden(1, false);
     QCOMPARE(view->isSectionHidden(0), false);
     QCOMPARE(view->sectionSize(0), view->defaultSectionSize());
+
+    // d->hiddenSectionSize could go out of sync when a new model
+    // was set which has fewer sections than before and some of them
+    // were hidden
+    QStandardItemModel model2(model->rowCount() - 1, model->columnCount());
+
+    for (int i = 0; i < model->rowCount(); ++i)
+        view->setSectionHidden(i, true);
+    view->setModel(&model2);
+    QVERIFY(view->sectionsHidden());
+    for (int i = 0; i < model2.rowCount(); ++i) {
+        QVERIFY(view->isSectionHidden(i));
+    }
+
+    view->setModel(model);
+    for (int i = 0; i < model2.rowCount(); ++i) {
+        QVERIFY(view->isSectionHidden(i));
+    }
+    QCOMPARE(view->isSectionHidden(model->rowCount() - 1), false);
+    for (int i = 0; i < model->rowCount(); ++i)
+        view->setSectionHidden(i, false);
 }
 
 void tst_QHeaderView::stretch()
@@ -1835,9 +1863,14 @@ void tst_QHeaderView::restoreBeforeSetModel()
 
 void tst_QHeaderView::defaultSectionSizeTest()
 {
+#if defined Q_OS_WINRT
+    QSKIP("Fails on WinRT - QTBUG-73309");
+#endif
+
     // Setup
     QTableView qtv;
     QHeaderView *hv = qtv.verticalHeader();
+    hv->setMinimumSectionSize(10);
     hv->setDefaultSectionSize(99); // Set it to a value different from defaultSize.
     QStandardItemModel amodel(4, 4);
     qtv.setModel(&amodel);
@@ -2824,6 +2857,7 @@ void tst_QHeaderView::additionalInit()
     QFETCH(bool, reset_model);
 
     m_using_reset_model = reset_model;
+    m_special_prepare = special_prepare;
 
     if (m_using_reset_model) {
         XResetModel *m = new XResetModel();
@@ -3037,18 +3071,34 @@ void tst_QHeaderView::mixedTests()
     view->moveSection(0, 5);
 
     for (int u = model->rowCount(); u >= 0; --u) {
-        if (u % 5 != 0)
+        if (u % 5 != 0) {
             view->hideSection(u);
-        if (u % 3 != 0)
+            QVERIFY(view->isSectionHidden(u));
+        }
+        if (u % 3 != 0) {
             view->showSection(u);
+            QVERIFY(!view->isSectionHidden(u));
+        }
     }
 
     model->insertRows(3, 7);
     model->removeRows(8, 3);
     model->setRowCount(model->rowCount() - 10);
 
+    // the upper is not visible (when m_using_reset_model is true)
+    // the lower 11 are modified due to insert/removeRows
+    for (int u = model->rowCount() - 1; u >= 11; --u) {
+        // when using reset, the hidden rows will *not* move
+        const int calcMod = m_using_reset_model ? u : u - 4;    // 7 added, 3 removed
+        if (calcMod % 5 != 0 && calcMod % 3 == 0) {
+            QVERIFY(view->isSectionHidden(u));
+        }
+        if (calcMod % 3 != 0) {
+            QVERIFY(!view->isSectionHidden(u));
+        }
+    }
     if (m_using_reset_model) {
-        const int precalced_results[] = { 898296472, 337096378, -543340640, 1, -1251526424, -568618976, 9250 };
+        const int precalced_results[] = { 898296472, 337096378, -543340640, -1964432121, -1251526424, -568618976, 9250 };
         calculateAndCheck(__LINE__, precalced_results);
     } else {
         const int precalced_results[] = { 1911338224, 1693514365, -613398968, -1912534953, 1582159424, -1851079000, 9300 };
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST b/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
index c6aeebc8f8..fea108f3fd 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
@@ -2,7 +2,3 @@
 opensuse-42.3 ci
 [testLineEditValidation]
 opensuse-42.3 ci
-[comboBox]
-# QTBUG-67282
-opensuse
-opensuse-leap
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index adedace8b2..7fd1822295 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -727,6 +727,16 @@ void tst_QItemDelegate::dateTimeEditor_data()
         << QDate(2006, 10, 31);
 }
 
+static QDateTimeEdit *findDateTimeEdit(const QWidget *widget)
+{
+    const auto dateTimeEditors = widget->findChildren<QDateTimeEdit *>();
+    for (auto dateTimeEditor : dateTimeEditors) {
+        if (qstrcmp(dateTimeEditor->metaObject()->className(), "QDateTimeEdit") == 0)
+            return dateTimeEditor;
+    }
+    return nullptr;
+}
+
 void tst_QItemDelegate::dateTimeEditor()
 {
     QFETCH(QTime, time);
@@ -742,17 +752,24 @@ void tst_QItemDelegate::dateTimeEditor()
     item3->setData(Qt::DisplayRole, QDateTime(date, time));
 
     QTableWidget widget(1, 3);
+    widget.setWindowTitle(QLatin1String(QTest::currentTestFunction())
+                          + QLatin1String("::")
+                          + QLatin1String(QTest::currentDataTag()));
     widget.setItem(0, 0, item1);
     widget.setItem(0, 1, item2);
     widget.setItem(0, 2, item3);
     widget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
+    QApplication::setActiveWindow(&widget);
 
     widget.editItem(item1);
 
     QTestEventLoop::instance().enterLoop(1);
 
-    QTimeEdit *timeEditor = widget.viewport()->findChild<QTimeEdit *>();
-    QVERIFY(timeEditor);
+
+    QTimeEdit *timeEditor = nullptr;
+    auto viewport = widget.viewport();
+    QTRY_VERIFY( (timeEditor = viewport->findChild<QTimeEdit *>()) );
     QCOMPARE(timeEditor->time(), time);
     // The data must actually be different in order for the model
     // to be updated.
@@ -763,8 +780,8 @@ void tst_QItemDelegate::dateTimeEditor()
     widget.setFocus();
     widget.editItem(item2);
 
-    QTRY_VERIFY(widget.viewport()->findChild<QDateEdit *>());
-    QDateEdit *dateEditor = widget.viewport()->findChild<QDateEdit *>();
+    QDateEdit *dateEditor = nullptr;
+    QTRY_VERIFY( (dateEditor = viewport->findChild<QDateEdit *>()) );
     QCOMPARE(dateEditor->date(), date);
     dateEditor->setDate(date.addDays(60));
 
@@ -774,12 +791,8 @@ void tst_QItemDelegate::dateTimeEditor()
 
     QTestEventLoop::instance().enterLoop(1);
 
-    QList<QDateTimeEdit *> dateTimeEditors = widget.findChildren<QDateTimeEdit *>();
-    QDateTimeEdit *dateTimeEditor = 0;
-    foreach(dateTimeEditor, dateTimeEditors)
-        if (dateTimeEditor->metaObject()->className() == QLatin1String("QDateTimeEdit"))
-            break;
-    QVERIFY(dateTimeEditor);
+    QDateTimeEdit *dateTimeEditor = nullptr;
+    QTRY_VERIFY( (dateTimeEditor = findDateTimeEdit(viewport)) );
     QCOMPARE(dateTimeEditor->date(), date);
     QCOMPARE(dateTimeEditor->time(), time);
     dateTimeEditor->setTime(time.addSecs(600));
@@ -1387,6 +1400,7 @@ void tst_QItemDelegate::comboBox()
     widget.setItem(0, 0, item1);
     widget.show();
     QVERIFY(QTest::qWaitForWindowExposed(&widget));
+    QApplication::setActiveWindow(&widget);
 
     widget.editItem(item1);
 
diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
index bbdaac5c6f..071665a5e3 100644
--- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
@@ -249,7 +249,7 @@ void tst_QItemView::populate()
             for (int y = 0; y < treeModel->columnCount(); ++y) {
                 QModelIndex index = treeModel->index(x, y, parent);
                 treeModel->setData(index, xS + QLatin1Char('_') + QString::number(y) + QLatin1Char('_') + iS);
-                treeModel->setData(index, QVariant(QColor(Qt::blue)), Qt::TextColorRole);
+                treeModel->setData(index, QVariant(QColor(Qt::blue)), Qt::ForegroundRole);
             }
         }
     }
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 433b9e55e1..0b828b8484 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -121,6 +121,7 @@ private slots:
     void task254449_draggingItemToNegativeCoordinates();
     void keyboardSearch();
     void shiftSelectionWithNonUniformItemSizes();
+    void shiftSelectionWithItemAlignment();
     void clickOnViewportClearsSelection();
     void task262152_setModelColumnNavigate();
     void taskQTBUG_2233_scrollHiddenItems_data();
@@ -380,8 +381,11 @@ void tst_QListView::cursorMove()
              << Qt::Key_Up << Qt::Key_Up << Qt::Key_Up << Qt::Key_Up << Qt::Key_Up
              << Qt::Key_Left << Qt::Key_Left << Qt::Key_Up << Qt::Key_Down;
 
-    int displayRow    = rows / displayColumns - 1;
-    int displayColumn = displayColumns - (rows % displayColumns) - 1;
+    int lastRow = rows / displayColumns - 1;
+    int lastColumn = displayColumns - 1;
+
+    int displayRow    = lastRow;
+    int displayColumn = lastColumn - (rows % displayColumns);
 
     QApplication::instance()->processEvents();
     for (int i = 0; i < keymoves.size(); ++i) {
@@ -395,10 +399,24 @@ void tst_QListView::cursorMove()
             displayRow = qMin(rows / displayColumns - 1, displayRow + 1);
             break;
         case Qt::Key_Left:
-            displayColumn = qMax(0, displayColumn - 1);
+            if (displayColumn > 0) {
+                displayColumn--;
+            } else {
+                if (displayRow > 0) {
+                    displayRow--;
+                    displayColumn = lastColumn;
+                }
+            }
             break;
         case Qt::Key_Right:
-            displayColumn = qMin(displayColumns-1, displayColumn + 1);
+            if (displayColumn < lastColumn) {
+                displayColumn++;
+            } else {
+                if (displayRow < lastRow) {
+                    displayRow++;
+                    displayColumn = 0;
+                }
+            }
             break;
         default:
             QVERIFY(false);
@@ -1785,6 +1803,51 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes()
     }
 }
 
+void tst_QListView::shiftSelectionWithItemAlignment()
+{
+    QStringList items;
+    for (int c = 0; c < 2; c++) {
+        for (int i = 10; i > 0; i--)
+            items << QString(i, QLatin1Char('*'));
+
+        for (int i = 1; i < 11; i++)
+            items << QString(i, QLatin1Char('*'));
+    }
+
+    QListView view;
+    view.setFlow(QListView::TopToBottom);
+    view.setWrapping(true);
+    view.setItemAlignment(Qt::AlignLeft);
+    view.setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+    QStringListModel model(items);
+    view.setModel(&model);
+
+    QFont font = view.font();
+    font.setPixelSize(10);
+    view.setFont(font);
+    view.resize(300, view.sizeHintForRow(0) * items.size() / 2 + view.horizontalScrollBar()->height());
+
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+    QCOMPARE(static_cast<QWidget *>(&view), QApplication::activeWindow());
+
+    QModelIndex index1 = view.model()->index(items.size() / 4, 0);
+    QPoint p = view.visualRect(index1).center();
+    QVERIFY(view.viewport()->rect().contains(p));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, p);
+    QCOMPARE(view.currentIndex(), index1);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), 1);
+
+    QModelIndex index2 = view.model()->index(items.size() / 4 * 3, 0);
+    p = view.visualRect(index2).center();
+    QVERIFY(view.viewport()->rect().contains(p));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::ShiftModifier, p);
+    QCOMPARE(view.currentIndex(), index2);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), index2.row() - index1.row() + 1);
+}
+
 void tst_QListView::clickOnViewportClearsSelection()
 {
     QStringList items;
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index d8e14df353..30afa69c31 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -344,7 +344,7 @@ void tst_QListWidget::addItem2()
     testWidget->addItem(item);
     QCOMPARE(testWidget->count(), ++count);
     QCOMPARE(testWidget->item(testWidget->count()-1), item);
-    QCOMPARE(testWidget->isItemHidden(item), false);
+    QCOMPARE(item->isHidden(), false);
 }
 
 void tst_QListWidget::addItems()
@@ -402,13 +402,18 @@ void tst_QListWidget::closePersistentEditor()
 
 void tst_QListWidget::setItemHidden()
 {
+#if QT_DEPRECATED_SINCE(5, 13)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     // Boundary checking
-    testWidget->setItemHidden(0, true);
-    testWidget->setItemHidden(0, false);
+    testWidget->setItemHidden(nullptr, true);
+    testWidget->setItemHidden(nullptr, false);
+QT_WARNING_POP
+#endif
 
     int totalHidden = 0;
     for (int i = 0; i < testWidget->model()->rowCount(); ++i)
-        if (testWidget->isItemHidden(testWidget->item(i)))
+        if (testWidget->item(i)->isHidden())
             totalHidden++;
 
     QListWidgetItem *item = new QListWidgetItem(QString::number(testWidget->count()));
@@ -417,31 +422,31 @@ void tst_QListWidget::setItemHidden()
     // Check that nothing else changed
     int newTotal = 0;
     for (int i = 0; i < testWidget->model()->rowCount(); ++i)
-        if (testWidget->isItemHidden(testWidget->item(i)))
+        if (testWidget->item(i)->isHidden())
             newTotal++;
     QCOMPARE(newTotal, totalHidden);
 
-    testWidget->setItemHidden(item, true);
-    QCOMPARE(testWidget->isItemHidden(item), true);
+    item->setHidden(true);
+    QCOMPARE(item->isHidden(), true);
 
     // Check that nothing else changed
     newTotal = 0;
     for (int i = 0; i < testWidget->model()->rowCount(); ++i)
-        if (testWidget->isItemHidden(testWidget->item(i)))
+        if (testWidget->item(i)->isHidden())
             newTotal++;
     QCOMPARE(newTotal, totalHidden + 1);
 
-    testWidget->setItemHidden(item, false);
-    QCOMPARE(testWidget->isItemHidden(item), false);
+    item->setHidden(false);
+    QCOMPARE(item->isHidden(), false);
 
     // Check that nothing else changed
     newTotal = 0;
     for (int i = 0; i < testWidget->model()->rowCount(); ++i)
-        if (testWidget->isItemHidden(testWidget->item(i)))
+        if (testWidget->item(i)->isHidden())
             newTotal++;
     QCOMPARE(newTotal, totalHidden);
 
-    testWidget->setItemHidden(item, true);
+    item->setHidden(true);
 }
 
 void tst_QListWidget::setCurrentItem_data()
@@ -847,7 +852,7 @@ void tst_QListWidget::selectedItems()
     testWidget->setSelectionMode(QListWidget::SingleSelection);
     for (int i=0; i<itemCount; ++i) {
         QListWidgetItem *item = testWidget->item(i);
-        testWidget->setItemSelected(item, true);
+        item->setSelected(true);
         QVERIFY(item->isSelected());
         QCOMPARE(testWidget->selectedItems().count(), 1);
     }
@@ -860,10 +865,10 @@ void tst_QListWidget::selectedItems()
     QCOMPARE(testWidget->count(), itemCount);
     // hide items
     foreach (int row, hiddenRows)
-        testWidget->setItemHidden(testWidget->item(row), true);
+        testWidget->item(row)->setHidden(true);
     // select items
     foreach (int row, selectedRows)
-        testWidget->setItemSelected(testWidget->item(row), true);
+        testWidget->item(row)->setSelected(true);
 
     // check that the correct number of items and the expected items are there
     QList<QListWidgetItem *> selectedItems = testWidget->selectedItems();
@@ -874,7 +879,7 @@ void tst_QListWidget::selectedItems()
     //check that isSelected agrees with selectedItems
     for (int i=0; i<itemCount; ++i) {
         QListWidgetItem *item = testWidget->item(i);
-        if (testWidget->isItemSelected(item))
+        if (item->isSelected())
             QVERIFY(selectedItems.contains(item));
     }
 }
diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
index fc231a4e30..be90475a6f 100644
--- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
@@ -1,2 +1,4 @@
 [moveCursorBiggerJump]
 osx
+[columnViewportPosition]
+winrt # QTBUG-72853
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 228d03350a..b1ddc6e7a2 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -1264,19 +1264,47 @@ void tst_QTableView::moveCursorStrikesBack_data()
     for (int i = 0; i < 7; ++i)
         fullList << i;
 
-    QTest::newRow("All disabled, wrap forward. Timeout => FAIL") << -1 << -1
+    QTest::newRow("All disabled, wrap forward. => invalid index") << -1 << -1
             << fullList
             << fullList
             << QRect()
             << 1 << 0 << (IntList() << int(QtTestTableView::MoveNext))
-            << 1 << 0;
+            << -1 << -1;
 
-    QTest::newRow("All disabled, wrap backwards. Timeout => FAIL") << -1 << -1
+    QTest::newRow("All disabled, wrap backwards. => invalid index") << -1 << -1
             << fullList
             << fullList
             << QRect()
             << 1 << 0 << (IntList() << int(QtTestTableView::MovePrevious))
+            << -1 << -1;
+
+    QTest::newRow("Last column disabled, MoveEnd. QTBUG-72400") << -1 << -1
+            << IntList()
+            << (IntList() << 6)
+            << QRect()
+            << 0 << 0 << (IntList() << int(QtTestTableView::MoveEnd))
+            << 0 << 5;
+
+    QTest::newRow("First column disabled, MoveHome. QTBUG-72400") << -1 << -1
+            << IntList()
+            << (IntList() << 0)
+            << QRect()
+            << 0 << 6 << (IntList() << int(QtTestTableView::MoveHome))
+            << 0 << 1;
+
+    QTest::newRow("First row disabled, MovePageUp. QTBUG-72400") << -1 << -1
+            << (IntList() << 0)
+            << IntList()
+            << QRect()
+            << 2 << 0 << (IntList() << int(QtTestTableView::MovePageUp))
             << 1 << 0;
+
+    QTest::newRow("Last row disabled, MovePageDown. QTBUG-72400") << -1 << -1
+            << (IntList() << 6)
+            << IntList()
+            << QRect()
+            << 4 << 0 << (IntList() << int(QtTestTableView::MovePageDown))
+            << 5 << 0;
 }
 
 void tst_QTableView::moveCursorStrikesBack()
@@ -1302,6 +1330,9 @@ void tst_QTableView::moveCursorStrikesBack()
     if (span.height() && span.width())
         view.setSpan(span.top(), span.left(), span.height(), span.width());
     view.show();
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+    // resize to make sure there are scrollbars
+    view.resize(view.columnWidth(0) * 7, view.rowHeight(0) * 7);
 
     QModelIndex index = model.index(startRow, startColumn);
     view.setCurrentIndex(index);
@@ -1320,9 +1351,6 @@ void tst_QTableView::moveCursorStrikesBack()
         newColumn = newIndex.column();
     }
 
-    // expected fails, task 119433
-    if(newRow == -1)
-        return;
     QCOMPARE(newRow, expectedRow);
     QCOMPARE(newColumn, expectedColumn);
 }
@@ -4225,7 +4253,7 @@ void tst_QTableView::task234926_setHeaderSorting()
     QStringList sortedDataA = data;
     QStringList sortedDataD = data;
     std::sort(sortedDataA.begin(), sortedDataA.end());
-    std::sort(sortedDataD.begin(), sortedDataD.end(), qGreater<QString>());
+    std::sort(sortedDataD.begin(), sortedDataD.end(), std::greater<QString>());
     model.setStringList(data);
     QTableView view;
     view.setModel(&model);
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index e7b40f5f24..c2de5c2761 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -91,6 +91,7 @@ private slots:
     void itemWithHeaderItems();
     void mimeData();
     void selectedRowAfterSorting();
+    void search();
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     void clearItemData();
 #endif
@@ -164,6 +165,7 @@ void tst_QTableWidget::initTestCase()
 {
     testWidget = new QTableWidget();
     testWidget->show();
+    QApplication::setKeyboardInputInterval(100);
 }
 
 void tst_QTableWidget::cleanupTestCase()
@@ -196,10 +198,10 @@ void tst_QTableWidget::clear()
 {
     QTableWidgetItem *item = new QTableWidgetItem("foo");
     testWidget->setItem(0, 0, item);
-    testWidget->setItemSelected(item, true);
+    item->setSelected(true);
 
     QVERIFY(testWidget->item(0, 0) == item);
-    QVERIFY(testWidget->isItemSelected(item));
+    QVERIFY(item->isSelected());
 
 
     QPointer<QObjectTableItem> bla = new QObjectTableItem();
@@ -367,11 +369,18 @@ void tst_QTableWidget::takeItem()
         for (int c = 0; c < testWidget->columnCount(); ++c)
             QCOMPARE(testWidget->item(r, c)->text(), QString::number(r * c + c));
 
+    QSignalSpy spy(testWidget, &QTableWidget::cellChanged);
     QTableWidgetItem *item = testWidget->takeItem(row, column);
     QCOMPARE(!!item, expectItem);
     if (expectItem) {
         QCOMPARE(item->text(), QString::number(row * column + column));
         delete item;
+
+        QTRY_COMPARE(spy.count(), 1);
+        const QList<QVariant> arguments = spy.takeFirst();
+        QCOMPARE(arguments.size(), 2);
+        QCOMPARE(arguments.at(0).toInt(), row);
+        QCOMPARE(arguments.at(1).toInt(), column);
     }
     QVERIFY(!testWidget->takeItem(row, column));
 }
@@ -576,7 +585,7 @@ void tst_QTableWidget::selectedItems()
                 continue;
 
             QTableWidgetItem *item = testWidget->item(row, column);
-            if (item && testWidget->isItemSelected(item))
+            if (item && item->isSelected())
                 QVERIFY(selectedItems.contains(item));
         }
     }
@@ -1558,7 +1567,7 @@ void tst_QTableWidget::task262056_sortDuplicate()
     }
     testWidget->sortItems(0, Qt::AscendingOrder);
     QSignalSpy layoutChangedSpy(testWidget->model(), SIGNAL(layoutChanged()));
-    testWidget->item(3,0)->setBackgroundColor(Qt::red);
+    testWidget->item(3,0)->setBackground(Qt::red);
 
     QCOMPARE(layoutChangedSpy.count(),0);
 
@@ -1591,6 +1600,7 @@ public:
 
     using QTableWidget::mimeData;
     using QTableWidget::indexFromItem;
+    using QTableWidget::keyPressEvent;
 };
 
 void tst_QTableWidget::mimeData()
@@ -1665,6 +1675,45 @@ void tst_QTableWidget::selectedRowAfterSorting()
     }
 }
 
+void tst_QTableWidget::search()
+{
+    auto createItem = [](const QString &txt)
+    {
+        auto item = new QTableWidgetItem(txt);
+        item->setFlags(item->flags().setFlag(Qt::ItemIsEditable, false));
+        return item;
+    };
+
+    auto checkSeries = [](TestTableWidget &tw, const QVector<QPair<QKeyEvent, int>> &series)
+    {
+        for (const auto &p : series) {
+            QKeyEvent e = p.first;
+            tw.keyPressEvent(&e);
+            QVERIFY(tw.selectionModel()->isSelected(tw.model()->index(p.second, 0)));
+        }
+    };
+    TestTableWidget tw(5, 1);
+    tw.setItem(0, 0, createItem("12"));
+    tw.setItem(1, 0, createItem("123"));
+    tw.setItem(2, 0, createItem("123 4"));
+    tw.setItem(3, 0, createItem("123 5"));
+    tw.setItem(4, 0, createItem(" "));
+    tw.show();
+
+    QKeyEvent evSpace(QEvent::KeyPress, Qt::Key_Space, Qt::NoModifier, " ");
+    QKeyEvent ev1(QEvent::KeyPress, Qt::Key_1, Qt::NoModifier, "1");
+    QKeyEvent ev2(QEvent::KeyPress, Qt::Key_2, Qt::NoModifier, "2");
+    QKeyEvent ev3(QEvent::KeyPress, Qt::Key_3, Qt::NoModifier, "3");
+    QKeyEvent ev4(QEvent::KeyPress, Qt::Key_4, Qt::NoModifier, "4");
+    QKeyEvent ev5(QEvent::KeyPress, Qt::Key_5, Qt::NoModifier, "5");
+
+    checkSeries(tw, {{evSpace, 4}, {ev1, 4}});
+    QTest::qWait(QApplication::keyboardInputInterval() * 2);
+    checkSeries(tw, {{ev1, 0}, {ev2, 0}, {ev3, 1}, {evSpace, 2}, {ev5, 3}});
+    QTest::qWait(QApplication::keyboardInputInterval() * 2);
+    checkSeries(tw, {{ev1, 0}, {ev2, 0}, {ev3, 1}, {evSpace, 2}, {ev4, 2}});
+}
+
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void tst_QTableWidget::clearItemData()
 {
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 39051c4969..c31de2ba22 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -69,6 +69,7 @@ public slots:
     void selectionOrderTest();
 
 private slots:
+    void initTestCase() { QApplication::setKeyboardInputInterval(100); }
     void getSetCheck();
 
     // one test per QTreeView property
@@ -112,7 +113,7 @@ private slots:
     void expandAndCollapse();
     void expandAndCollapseAll();
     void expandWithNoChildren();
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     void quickExpandCollapse();
 #endif
     void keyboardNavigation();
@@ -199,6 +200,7 @@ private slots:
     void taskQTBUG_45697_crash();
     void taskQTBUG_7232_AllowUserToControlSingleStep();
     void taskQTBUG_8376();
+    void taskQTBUG_61476();
     void testInitialFocus();
 };
 
@@ -1647,50 +1649,96 @@ void tst_QTreeView::expandAndCollapse()
     }
 }
 
+static void checkExpandState(const QAbstractItemModel &model, const QTreeView &view,
+                             const QModelIndex &startIdx, bool bIsExpanded, int *count)
+{
+    *count = 0;
+    QStack<QModelIndex> parents;
+    parents.push(startIdx);
+    if (startIdx.isValid()) {
+        QCOMPARE(view.isExpanded(startIdx), bIsExpanded);
+        *count += 1;
+    }
+    while (!parents.isEmpty()) {
+        const QModelIndex p = parents.pop();
+        const int rows = model.rowCount(p);
+        for (int r = 0; r < rows; ++r) {
+            const QModelIndex c = model.index(r, 0, p);
+            QCOMPARE(view.isExpanded(c), bIsExpanded);
+            parents.push(c);
+        }
+        *count += rows;
+    }
+}
+
 void tst_QTreeView::expandAndCollapseAll()
 {
-    QtTestModel model(3, 2);
-    model.levels = 2;
+    QStandardItemModel model;
+    // QtTestModel has a broken parent/child handling which will break the test
+    for (int i1 = 0; i1 < 3; ++i1) {
+        QStandardItem *s1 = new QStandardItem;
+        s1->setText(QString::number(i1));
+        model.appendRow(s1);
+        for (int i2 = 0; i2 < 3; ++i2) {
+            QStandardItem *s2 = new QStandardItem;
+            s2->setText(QStringLiteral("%1 - %2").arg(i1).arg(i2));
+            s1->appendRow(s2);
+            for (int i3 = 0; i3 < 3; ++i3) {
+                QStandardItem *s3 = new QStandardItem;
+                s3->setText(QStringLiteral("%1 - %2 - %3").arg(i1).arg(i2).arg(i3));
+                s2->appendRow(s3);
+            }
+        }
+    }
     QTreeView view;
     view.setUniformRowHeights(true);
     view.setModel(&model);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
-    QSignalSpy expandedSpy(&view, SIGNAL(expanded(QModelIndex)));
-    QSignalSpy collapsedSpy(&view, SIGNAL(collapsed(QModelIndex)));
+    QSignalSpy expandedSpy(&view, &QTreeView::expanded);
+    QSignalSpy collapsedSpy(&view, &QTreeView::collapsed);
+    int count;
 
     view.expandAll();
-    view.show();
-
+    checkExpandState(model, view, QModelIndex(), true, &count);
     QCOMPARE(collapsedSpy.count(), 0);
+    QCOMPARE(expandedSpy.count(),  39); // == 3 (first) + 9 (second) + 27 (third level)
+    QCOMPARE(count, 39);
 
-    QStack<QModelIndex> parents;
-    parents.push(QModelIndex());
-    int count = 0;
-    while (!parents.isEmpty()) {
-        QModelIndex p = parents.pop();
-        int rows = model.rowCount(p);
-        for (int r = 0; r < rows; ++r)
-            QVERIFY(view.isExpanded(model.index(r, 0, p)));
-        count += rows;
-        for (int r = 0; r < rows; ++r)
-            parents.push(model.index(r, 0, p));
-    }
-    QCOMPARE(expandedSpy.count(), 12); // == (3+1)*(2+1) from QtTestModel model(3, 2);
-
+    collapsedSpy.clear();
+    expandedSpy.clear();
     view.collapseAll();
-
-    parents.push(QModelIndex());
-    count = 0;
-    while (!parents.isEmpty()) {
-        QModelIndex p = parents.pop();
-        int rows = model.rowCount(p);
-        for (int r = 0; r < rows; ++r)
-            QVERIFY(!view.isExpanded(model.index(r, 0, p)));
-        count += rows;
-        for (int r = 0; r < rows; ++r)
-            parents.push(model.index(r, 0, p));
-    }
-    QCOMPARE(collapsedSpy.count(), 12);
+    checkExpandState(model, view, QModelIndex(), false, &count);
+    QCOMPARE(collapsedSpy.count(), 39);
+    QCOMPARE(expandedSpy.count(), 0);
+    QCOMPARE(count, 39);
+
+    collapsedSpy.clear();
+    expandedSpy.clear();
+    view.expandRecursively(model.index(0, 0));
+    QCOMPARE(expandedSpy.count(), 13); // 1 + 3 + 9
+
+    checkExpandState(model, view, model.index(0, 0), true, &count);
+    QCOMPARE(count, 13);
+    checkExpandState(model, view, model.index(1, 0), false, &count);
+    QCOMPARE(count, 13);
+    checkExpandState(model, view, model.index(2, 0), false, &count);
+    QCOMPARE(count, 13);
+
+    expandedSpy.clear();
+    view.collapseAll();
+    view.expandRecursively(model.index(0, 0), 1);
+    QCOMPARE(expandedSpy.count(), 4); // 1 + 3
+    view.expandRecursively(model.index(0, 0), 2);
+    QCOMPARE(expandedSpy.count(), 13); // (1 + 3) + 9
+
+    checkExpandState(model, view, model.index(0, 0), true, &count);
+    QCOMPARE(count, 13);
+    checkExpandState(model, view, model.index(1, 0), false, &count);
+    QCOMPARE(count, 13);
+    checkExpandState(model, view, model.index(2, 0), false, &count);
+    QCOMPARE(count, 13);
 }
 
 void tst_QTreeView::expandWithNoChildren()
@@ -1749,7 +1797,7 @@ void tst_QTreeView::keyboardNavigation()
         case Qt::Key_Down:
             if (view.isExpanded(index)) {
                 row = 0;
-                index = index.child(row, column);
+                index = model.index(row, column, index);
             } else {
                 row = qMin(rows - 1, row + 1);
                 index = index.sibling(row, column);
@@ -2746,7 +2794,7 @@ void tst_QTreeView::sortByColumn()
 
     view.setSortingEnabled(sortingEnabled);
     view.setModel(&model);
-    view.sortByColumn(1);
+    view.sortByColumn(1, Qt::DescendingOrder);
     QCOMPARE(view.header()->sortIndicatorSection(), 1);
     QCOMPARE(view.model()->data(view.model()->index(0,1)).toString(), QString::fromLatin1("h"));
     QCOMPARE(view.model()->data(view.model()->index(1,1)).toString(), QString::fromLatin1("g"));
@@ -3056,7 +3104,7 @@ void tst_QTreeView::evilModel()
     view.resizeColumnToContents(1);
     model.change();
 
-    view.sortByColumn(1);
+    view.sortByColumn(1, Qt::DescendingOrder);
     model.change();
 
     view.selectAll();
@@ -3900,7 +3948,7 @@ void tst_QTreeView::task254234_proxySort()
     model.setItem(2,1,new QStandardItem("h"));
     model.setItem(3,1,new QStandardItem("f"));
 
-    view.sortByColumn(1);
+    view.sortByColumn(1, Qt::DescendingOrder);
     view.setSortingEnabled(true);
 
     QSortFilterProxyModel proxy;
@@ -4088,6 +4136,30 @@ void tst_QTreeView::keyboardNavigationWithDisabled()
     QCOMPARE(view.currentIndex(), model.index(12, 0));
     QTest::keyClick(view.viewport(), Qt::Key_Up);
     QCOMPARE(view.currentIndex(), model.index(6, 0));
+    // QTBUG-44746 - when first/last item is disabled,
+    // Key_PageUp/Down/Home/End will not work as expected.
+    model.item(0)->setEnabled(false);
+    model.item(1)->setEnabled(true);
+    model.item(2)->setEnabled(true);
+    model.item(model.rowCount() - 1)->setEnabled(false);
+    model.item(model.rowCount() - 2)->setEnabled(true);
+    model.item(model.rowCount() - 3)->setEnabled(true);
+    // PageUp
+    view.setCurrentIndex(model.index(2, 0));
+    QCOMPARE(view.currentIndex(), model.index(2, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_PageUp);
+    QCOMPARE(view.currentIndex(), model.index(1, 0));
+    // PageDown
+    view.setCurrentIndex(model.index(model.rowCount() - 3, 0));
+    QCOMPARE(view.currentIndex(), model.index(model.rowCount() - 3, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_PageDown);
+    QCOMPARE(view.currentIndex(), model.index(model.rowCount() - 2, 0));
+    // Key_Home
+    QTest::keyClick(view.viewport(), Qt::Key_Home);
+    QCOMPARE(view.currentIndex(), model.index(1, 0));
+    // Key_End
+    QTest::keyClick(view.viewport(), Qt::Key_End);
+    QCOMPARE(view.currentIndex(), model.index(model.rowCount() - 2, 0));
 }
 
 class RemoveColumnOne : public QSortFilterProxyModel
@@ -4419,7 +4491,7 @@ void tst_QTreeView::testInitialFocus()
     QCOMPARE(treeWidget.currentIndex().column(), 2);
 }
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 void tst_QTreeView::quickExpandCollapse()
 {
     //this unit tests makes sure the state after the animation is restored correctly
@@ -4451,7 +4523,7 @@ void tst_QTreeView::quickExpandCollapse()
 
     QCOMPARE(tree.state(), initialState);
 }
-#endif
+#endif // animation
 
 void tst_QTreeView::taskQTBUG_37813_crash()
 {
@@ -4735,5 +4807,58 @@ void tst_QTreeView::taskQTBUG_8376()
     QCOMPARE(rowHeightLvl1Visible, rowHeightLvl1Visible2);
 }
 
+void tst_QTreeView::taskQTBUG_61476()
+{
+    // This checks that if a user clicks on an item to collapse it that it
+    // does not edit (in this case change the check state) the item that is
+    // now over the mouse just because it got a release event
+    QTreeView tv;
+    QStandardItemModel model;
+    QStandardItem *lastTopLevel = nullptr;
+    {
+        for (int i = 0; i < 4; ++i) {
+            QStandardItem *item = new QStandardItem(QLatin1String("Row Item"));
+            item->setCheckable(true);
+            item->setCheckState(Qt::Checked);
+            model.appendRow(item);
+            lastTopLevel = item;
+            for (int j = 0; j < 2; ++j) {
+                QStandardItem *childItem = new QStandardItem(QLatin1String("Child row Item"));
+                childItem->setCheckable(true);
+                childItem->setCheckState(Qt::Checked);
+                item->appendRow(childItem);
+                QStandardItem *grandChild = new QStandardItem(QLatin1String("Grand child row Item"));
+                grandChild->setCheckable(true);
+                grandChild->setCheckState(Qt::Checked);
+                childItem->appendRow(grandChild);
+            }
+        }
+    }
+    tv.setModel(&model);
+    tv.expandAll();
+    // We need it to be this size so that the effect of the collapsing will
+    // cause the parent item to move to be under the cursor
+    tv.resize(200, 200);
+    tv.show();
+    QVERIFY(QTest::qWaitForWindowActive(&tv));
+    tv.verticalScrollBar()->setValue(tv.verticalScrollBar()->maximum());
+
+    // We want to press specifically right around where a checkbox for the
+    // parent item could be when collapsing
+    QTreeViewPrivate *priv = static_cast<QTreeViewPrivate*>(qt_widget_private(&tv));
+    const QModelIndex mi = lastTopLevel->child(0)->index();
+    const QRect rect = priv->itemDecorationRect(mi);
+    const QPoint pos = rect.center();
+
+    QTest::mousePress(tv.viewport(), Qt::LeftButton, 0, pos);
+    if (tv.style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, 0, &tv) ==
+        QEvent::MouseButtonPress)
+        QTRY_VERIFY(!tv.isExpanded(mi));
+
+    QTest::mouseRelease(tv.viewport(), Qt::LeftButton, 0, pos);
+    QTRY_VERIFY(!tv.isExpanded(mi));
+    QCOMPARE(lastTopLevel->checkState(), Qt::Checked);
+}
+
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index c5ccbc0d0b..33d4f3bf91 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -99,6 +99,7 @@ private slots:
     void insertTopLevelItems_data();
     void insertTopLevelItems();
     void keyboardNavigation();
+    void keyboardNavigationWithHidden();
     void scrollToItem();
     void setSortingEnabled();
     void match();
@@ -140,6 +141,7 @@ private slots:
     void expandAndCallapse();
     void itemData();
     void setDisabled();
+    void setSpanned();
     void removeSelectedItem();
     void removeCurrentItem();
     void removeCurrentItem_task186451();
@@ -608,31 +610,31 @@ void tst_QTreeWidget::setItemHidden()
     QVERIFY(testWidget->visualItemRect(child).isValid()
            && testWidget->viewport()->rect().intersects(testWidget->visualItemRect(child)));
 
-    QVERIFY(!testWidget->isItemHidden(parent));
-    QVERIFY(!testWidget->isItemHidden(child));
+    QVERIFY(!parent->isHidden());
+    QVERIFY(!child->isHidden());
 
-    testWidget->setItemHidden(parent, true);
+    parent->setHidden(true);
 
     QVERIFY(!(testWidget->visualItemRect(parent).isValid()
              && testWidget->viewport()->rect().intersects(testWidget->visualItemRect(parent))));
     QVERIFY(!(testWidget->visualItemRect(child).isValid()
              && testWidget->viewport()->rect().intersects(testWidget->visualItemRect(child))));
 
-    QVERIFY(testWidget->isItemHidden(parent));
-    QVERIFY(!testWidget->isItemHidden(child));
+    QVERIFY(parent->isHidden());
+    QVERIFY(!child->isHidden());
 
     // From task 78670 (This caused an core dump)
     // Check if we can set an item visible if it already is visible.
-    testWidget->setItemHidden(parent, false);
-    testWidget->setItemHidden(parent, false);
-    QVERIFY(!testWidget->isItemHidden(parent));
+    parent->setHidden(false);
+    parent->setHidden(false);
+    QVERIFY(!parent->isHidden());
 
 
     // hide, hide and then unhide.
-    testWidget->setItemHidden(parent, true);
-    testWidget->setItemHidden(parent, true);
-    testWidget->setItemHidden(parent, false);
-    QVERIFY(!testWidget->isItemHidden(parent));
+    parent->setHidden(true);
+    parent->setHidden(true);
+    parent->setHidden(false);
+    QVERIFY(!parent->isHidden());
 
 
 }
@@ -658,7 +660,7 @@ void tst_QTreeWidget::setItemHidden2()
 
     if (testWidget->topLevelItemCount() > 0) {
         top = testWidget->topLevelItem(0);
-        testWidget->setItemExpanded(top, true);
+        top->setExpanded(true);
     }
 
     if (testWidget->topLevelItemCount() > 0) {
@@ -666,8 +668,8 @@ void tst_QTreeWidget::setItemHidden2()
         for (int i = 0; i < top->childCount(); i++) {
             leaf = top->child(i);
             if (leaf->text(0).toInt() % 2 == 0) {
-                if (!testWidget->isItemHidden(leaf)) {
-                    testWidget->setItemHidden(leaf, true);
+                if (!leaf->isHidden()) {
+                    leaf->setHidden(true);
                 }
             }
         }
@@ -821,7 +823,7 @@ void tst_QTreeWidget::selectedItems()
             else
                 item = item->child(index);
         }
-        testWidget->setItemSelected(item, true);
+        item->setSelected(true);
     }
 
     // hide rows
@@ -833,7 +835,7 @@ void tst_QTreeWidget::selectedItems()
             else
                 item = item->child(index);
         }
-        testWidget->setItemHidden(item, true);
+        item->setHidden(true);
     }
 
     // open/close toplevel
@@ -862,18 +864,23 @@ void tst_QTreeWidget::selectedItems()
     // compare isSelected
     for (int t=0; t<testWidget->topLevelItemCount(); ++t) {
         QTreeWidgetItem *top = testWidget->topLevelItem(t);
-        if (testWidget->isItemSelected(top) && !testWidget->isItemHidden(top))
+        if (top->isSelected() && !top->isHidden())
             QVERIFY(sel.contains(top));
         for (int c=0; c<top->childCount(); ++c) {
             QTreeWidgetItem *child = top->child(c);
-            if (testWidget->isItemSelected(child) && !testWidget->isItemHidden(child))
+            if (child->isSelected() && !child->isHidden())
                 QVERIFY(sel.contains(child));
         }
     }
 
+#if QT_DEPRECATED_SINCE(5, 13)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
     // Possible to select null without crashing?
-    testWidget->setItemSelected(0, true);
-    QVERIFY(!testWidget->isItemSelected(0));
+    testWidget->setItemSelected(nullptr, true);
+    QVERIFY(!testWidget->isItemSelected(nullptr));
+QT_WARNING_POP
+#endif
 
     // unselect
     foreach (IntList itemPath, selectedItems) {
@@ -884,7 +891,7 @@ void tst_QTreeWidget::selectedItems()
             else
                 item = item->child(index);
         }
-        testWidget->setItemSelected(item, false);
+        item->setSelected(false);
     }
     QCOMPARE(testWidget->selectedItems().count(), 0);
 }
@@ -1010,21 +1017,21 @@ void tst_QTreeWidget::expand()
     QTreeWidgetItem *topLevelItem = testWidget->topLevelItem(topLevelIndex);
     QTreeWidgetItem *childItem = topLevelItem->child(childIndex);
 
-    QVERIFY(!testWidget->isItemExpanded(topLevelItem));
-    testWidget->setItemExpanded(topLevelItem, true);
-    QVERIFY(testWidget->isItemExpanded(topLevelItem));
+    QVERIFY(!topLevelItem->isExpanded());
+    topLevelItem->setExpanded(true);
+    QVERIFY(topLevelItem->isExpanded());
 
-    QVERIFY(!testWidget->isItemExpanded(childItem));
-    testWidget->setItemExpanded(childItem, true);
-    QVERIFY(testWidget->isItemExpanded(childItem));
+    QVERIFY(!childItem->isExpanded());
+    childItem->setExpanded(true);
+    QVERIFY(childItem->isExpanded());
 
-    QVERIFY(testWidget->isItemExpanded(topLevelItem));
-    testWidget->setItemExpanded(topLevelItem, false);
-    QVERIFY(!testWidget->isItemExpanded(topLevelItem));
+    QVERIFY(topLevelItem->isExpanded());
+    topLevelItem->setExpanded(false);
+    QVERIFY(!topLevelItem->isExpanded());
 
-    QVERIFY(testWidget->isItemExpanded(childItem));
-    testWidget->setItemExpanded(childItem, false);
-    QVERIFY(!testWidget->isItemExpanded(childItem));
+    QVERIFY(childItem->isExpanded());
+    childItem->setExpanded(false);
+    QVERIFY(!childItem->isExpanded());
 }
 
 void tst_QTreeWidget::checkState_data()
@@ -1525,7 +1532,7 @@ void tst_QTreeWidget::keyboardNavigation()
             }
             break;
         case Qt::Key_Down:
-            if (testWidget->isItemExpanded(item)) {
+            if (item->isExpanded()) {
                 row = 0;
                 item = item->child(row);
             } else {
@@ -1538,7 +1545,7 @@ void tst_QTreeWidget::keyboardNavigation()
             break;
         case Qt::Key_Left:
             if (checkScroll) {
-                QVERIFY(testWidget->isItemExpanded(item));
+                QVERIFY(item->isExpanded());
                 QCOMPARE(scrollBar->value(), valueBeforeClick - scrollBar->singleStep());
             }
             // windows style right will walk to the parent
@@ -1572,6 +1579,33 @@ void tst_QTreeWidget::keyboardNavigation()
     }
 }
 
+void tst_QTreeWidget::keyboardNavigationWithHidden()
+{
+    QTreeWidget tw;
+    for (int i = 0; i < 1000; ++i)
+        tw.addTopLevelItem(new QTreeWidgetItem({QString::number(i), QStringLiteral("second col")}));
+    // QTBUG-34832 - when first/last item is hidden,
+    // Key_PageUp/Down/Home/End will not work as expected.
+    tw.topLevelItem(0)->setHidden(true);
+    tw.topLevelItem(tw.model()->rowCount() - 1)->setHidden(true);
+    // PageUp
+    tw.setCurrentIndex(tw.model()->index(2, 0));
+    QCOMPARE(tw.currentIndex(), tw.model()->index(2, 0));
+    QTest::keyClick(tw.viewport(), Qt::Key_PageUp);
+    QCOMPARE(tw.currentIndex(), tw.model()->index(1, 0));
+    // PageDown
+    tw.setCurrentIndex(tw.model()->index(tw.model()->rowCount() - 3, 0));
+    QCOMPARE(tw.currentIndex(), tw.model()->index(tw.model()->rowCount() - 3, 0));
+    QTest::keyClick(tw.viewport(), Qt::Key_PageDown);
+    QCOMPARE(tw.currentIndex(), tw.model()->index(tw.model()->rowCount() - 2, 0));
+    // Key_Home
+    QTest::keyClick(tw.viewport(), Qt::Key_Home);
+    QCOMPARE(tw.currentIndex(), tw.model()->index(1, 0));
+    // Key_End
+    QTest::keyClick(tw.viewport(), Qt::Key_End);
+    QCOMPARE(tw.currentIndex(), tw.model()->index(tw.model()->rowCount() - 2, 0));
+}
+
 void tst_QTreeWidget::scrollToItem()
 {
     // Check if all parent nodes of the item found are expanded.
@@ -1597,9 +1631,9 @@ void tst_QTreeWidget::scrollToItem()
     QCOMPARE(search->text(0), QLatin1String("111"));
 
     QTreeWidgetItem *par = search->parent();
-    QVERIFY(testWidget->isItemExpanded(par));
+    QVERIFY(par->isExpanded());
     par = par->parent();
-    QVERIFY(testWidget->isItemExpanded(par));
+    QVERIFY(par->isExpanded());
 }
 
 // From task #85413
@@ -1845,14 +1879,14 @@ void tst_QTreeWidget::setData()
                     item->setBackground(j, backgroundColor);
                     QCOMPARE(itemChangedSpy.count(), 0);
 
-                    QColor textColor((i == 1) ? Qt::green : Qt::cyan);
-                    item->setTextColor(j, textColor);
-                    QCOMPARE(item->textColor(j), textColor);
+                    const QColor foregroundColor((i == 1) ? Qt::green : Qt::cyan);
+                    item->setForeground(j, foregroundColor);
+                    QCOMPARE(item->foreground(j), foregroundColor);
                     QCOMPARE(itemChangedSpy.count(), 1);
                     args = itemChangedSpy.takeFirst();
                     QCOMPARE(qvariant_cast<QTreeWidgetItem*>(args.at(0)), item);
                     QCOMPARE(qvariant_cast<int>(args.at(1)), j);
-                    item->setTextColor(j, textColor);
+                    item->setForeground(j, foregroundColor);
                     QCOMPARE(itemChangedSpy.count(), 0);
 
                     Qt::CheckState checkState((i == 1) ? Qt::PartiallyChecked : Qt::Checked);
@@ -1874,7 +1908,7 @@ void tst_QTreeWidget::setData()
                     QCOMPARE(item->font(j), font);
                     QCOMPARE(item->textAlignment(j), int(textAlignment));
                     QCOMPARE(item->background(j).color(), backgroundColor);
-                    QCOMPARE(item->textColor(j), textColor);
+                    QCOMPARE(item->foreground(j), foregroundColor);
                     QCOMPARE(item->checkState(j), checkState);
 
                     QCOMPARE(qvariant_cast<QString>(item->data(j, Qt::DisplayRole)), text);
@@ -1885,9 +1919,8 @@ void tst_QTreeWidget::setData()
                     QCOMPARE(qvariant_cast<QSize>(item->data(j, Qt::SizeHintRole)), sizeHint);
                     QCOMPARE(qvariant_cast<QFont>(item->data(j, Qt::FontRole)), font);
                     QCOMPARE(qvariant_cast<int>(item->data(j, Qt::TextAlignmentRole)), int(textAlignment));
-                    QCOMPARE(qvariant_cast<QBrush>(item->data(j, Qt::BackgroundColorRole)), QBrush(backgroundColor));
                     QCOMPARE(qvariant_cast<QBrush>(item->data(j, Qt::BackgroundRole)), QBrush(backgroundColor));
-                    QCOMPARE(qvariant_cast<QColor>(item->data(j, Qt::TextColorRole)), textColor);
+                    QCOMPARE(qvariant_cast<QColor>(item->data(j, Qt::ForegroundRole)), foregroundColor);
                     QCOMPARE(qvariant_cast<int>(item->data(j, Qt::CheckStateRole)), int(checkState));
 
                     item->setBackground(j, pixmap);
@@ -1907,8 +1940,8 @@ void tst_QTreeWidget::setData()
                     item->setData(j, Qt::SizeHintRole, QVariant());
                     item->setData(j, Qt::FontRole, QVariant());
                     item->setData(j, Qt::TextAlignmentRole, QVariant());
-                    item->setData(j, Qt::BackgroundColorRole, QVariant());
-                    item->setData(j, Qt::TextColorRole, QVariant());
+                    item->setData(j, Qt::BackgroundRole, QVariant());
+                    item->setData(j, Qt::ForegroundRole, QVariant());
                     item->setData(j, Qt::CheckStateRole, QVariant());
                     QCOMPARE(itemChangedSpy.count(), 11);
                     itemChangedSpy.clear();
@@ -1921,9 +1954,8 @@ void tst_QTreeWidget::setData()
                     QCOMPARE(item->data(j, Qt::SizeHintRole), QVariant());
                     QCOMPARE(item->data(j, Qt::FontRole), QVariant());
                     QCOMPARE(item->data(j, Qt::TextAlignmentRole), QVariant());
-                    QCOMPARE(item->data(j, Qt::BackgroundColorRole), QVariant());
                     QCOMPARE(item->data(j, Qt::BackgroundRole), QVariant());
-                    QCOMPARE(item->data(j, Qt::TextColorRole), QVariant());
+                    QCOMPARE(item->data(j, Qt::ForegroundRole), QVariant());
                     QCOMPARE(item->data(j, Qt::CheckStateRole), QVariant());
                 }
             }
@@ -2818,6 +2850,28 @@ void tst_QTreeWidget::setDisabled()
     QCOMPARE(takenChildren.items[1]->isDisabled(), false);
 }
 
+void tst_QTreeWidget::setSpanned()
+{
+    QTreeWidget w;
+    QTreeWidgetItem *i1 = new QTreeWidgetItem();
+    QScopedPointer<QTreeWidgetItem> i2(new QTreeWidgetItem());
+
+    QTreeWidgetItem *top = new QTreeWidgetItem(&w);
+    top->addChild(i1);
+
+    top->setFirstColumnSpanned(true);
+    QCOMPARE(top->isFirstColumnSpanned(), true);
+    QCOMPARE(i1->isFirstColumnSpanned(), false);
+    QCOMPARE(i2->isFirstColumnSpanned(), false);
+
+    top->setFirstColumnSpanned(false);
+    i1->setFirstColumnSpanned(true);
+    i2->setFirstColumnSpanned(true);
+    QCOMPARE(top->isFirstColumnSpanned(), false);
+    QCOMPARE(i1->isFirstColumnSpanned(), true);
+    QCOMPARE(i2->isFirstColumnSpanned(), false);
+}
+
 void tst_QTreeWidget::removeSelectedItem()
 {
     const QScopedPointer <QTreeWidget> w(new QTreeWidget);
@@ -2919,14 +2973,14 @@ void tst_QTreeWidget::randomExpand()
     QTreeWidgetItem *newItem1 = 0;
     for (int i = 0; i < 100; i++) {
         newItem1 = new QTreeWidgetItem(&tree, item1);
-        tree.setItemExpanded(newItem1, true);
-        QCOMPARE(tree.isItemExpanded(newItem1), true);
+        newItem1->setExpanded(true);
+        QCOMPARE(newItem1->isExpanded(), true);
 
         QTreeWidgetItem *x = new QTreeWidgetItem();
-        QCOMPARE(tree.isItemExpanded(newItem1), true);
+        QCOMPARE(newItem1->isExpanded(), true);
         newItem1->addChild(x);
 
-        QCOMPARE(tree.isItemExpanded(newItem1), true);
+        QCOMPARE(newItem1->isExpanded(), true);
     }
 
 }
@@ -2939,19 +2993,19 @@ void tst_QTreeWidget::crashTest()
 
     QTreeWidgetItem *item1 = new QTreeWidgetItem(tree);
     item1->setText(0, "item1");
-    tree->setItemExpanded(item1, true);
+    item1->setExpanded(true);
     QTreeWidgetItem *item2 = new QTreeWidgetItem(item1);
     item2->setText(0, "item2");
 
     QTreeWidgetItem *item3 = new QTreeWidgetItem(tree, item1);
     item3->setText(0, "item3");
-    tree->setItemExpanded(item3, true);
+    item3->setExpanded(true);
     QTreeWidgetItem *item4 = new QTreeWidgetItem(item3);
     item4->setText(0, "item4");
 
     QTreeWidgetItem *item5 = new QTreeWidgetItem(tree, item3);
     item5->setText(0, "item5");
-    tree->setItemExpanded(item5, true);
+    item5->setExpanded(true);
     QTreeWidgetItem *item6 = new QTreeWidgetItem(item5);
     item6->setText(0, "item6");
 
@@ -3417,6 +3471,7 @@ void tst_QTreeWidget::setChildIndicatorPolicy()
     treeWidget.setItemDelegate(&delegate);
     treeWidget.show();
     QVERIFY(QTest::qWaitForWindowExposed(&treeWidget));
+    QCoreApplication::processEvents(); // Process all queued paint events
 
     QTreeWidgetItem *item = new QTreeWidgetItem(QStringList("Hello"));
     treeWidget.insertTopLevelItem(0, item);
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index c2c02f3766..76ca148d3f 100644
--- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
@@ -95,11 +95,11 @@ void tst_QTreeWidgetItemIterator::initTestCase()
         const QString topS = QLatin1String("top") + QString::number(i);
         top->setText(0, topS);
         switch (i) {
-            case 0:  testWidget->setItemHidden(top, true);break;
-            case 1:  testWidget->setItemHidden(top, false);break;
+            case 0:  top->setHidden(true);break;
+            case 1:  top->setHidden(false);break;
 
-            case 2:  testWidget->setItemSelected(top, true);break;
-            case 3:  testWidget->setItemSelected(top, false);break;
+            case 2:  top->setSelected(true);break;
+            case 3:  top->setSelected(false);break;
 
             case 4:  top->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);break;
             case 5:  top->setFlags(Qt::ItemIsEnabled);break;
@@ -126,11 +126,11 @@ void tst_QTreeWidgetItemIterator::initTestCase()
             QTreeWidgetItem *child = new QTreeWidgetItem(top);
             child->setText(0, topS + QLatin1String(",child") + QString::number(j));
             switch (j) {
-                case 0:  testWidget->setItemHidden(child, true);break;
-                case 1:  testWidget->setItemHidden(child, false);break;
+                case 0:  child->setHidden(true);break;
+                case 1:  child->setHidden(false);break;
 
-                case 2:  testWidget->setItemSelected(child, true);break;
-                case 3:  testWidget->setItemSelected(child, false);break;
+                case 2:  child->setSelected(true);break;
+                case 3:  child->setSelected(false);break;
 
                 case 4:  child->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);break;
                 case 5:  child->setFlags(Qt::ItemIsEnabled);break;