1 files changed, 71 insertions, 1 deletions

diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 2d09b01c26..08233a1f7b 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -1,7 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
+#include <QtTest/private/qcomparisontesthelper_p.h>
 #include <QtTest/private/qpropertytesthelper_p.h>
 #include <QSignalSpy>
 
@@ -24,6 +25,7 @@ public slots:
     void cleanupTestCase();
     void init();
 private slots:
+    void compareCompiles();
     void clear_data();
     void clear();
     void clearAndSelect();
@@ -55,8 +57,10 @@ private slots:
     void merge();
     void isRowSelected();
     void childrenDeselectionSignal();
+#if QT_CONFIG(proxymodel)
     void layoutChangedWithAllSelected1();
     void layoutChangedWithAllSelected2();
+#endif
     void layoutChangedTreeSelection();
     void deselectRemovedMiddleRange();
     void setModel();
@@ -73,14 +77,20 @@ private slots:
     void QTBUG48402();
 
     void QTBUG58851_data();
+#if QT_CONFIG(proxymodel)
     void QTBUG58851();
+#endif
 
     void QTBUG18001_data();
     void QTBUG18001();
 
     void QTBUG93305();
 
+    void testSignalsDisconnection();
+    void destroyModel();
+
 private:
+    static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
     QAbstractItemModel *model;
     QItemSelectionModel *selection;
 };
@@ -209,6 +219,11 @@ void tst_QItemSelectionModel::init()
         model->insertRow(0, QModelIndex());
 }
 
+void tst_QItemSelectionModel::compareCompiles()
+{
+    QTestPrivate::testEqualityOperatorsCompile<QItemSelectionRange>();
+}
+
 void tst_QItemSelectionModel::clear_data()
 {
     QTest::addColumn<QModelIndexList>("indexList");
@@ -2249,6 +2264,7 @@ void tst_QItemSelectionModel::childrenDeselectionSignal()
     QVERIFY(selectionModel.selection().contains(sel2));
 }
 
+#if QT_CONFIG(proxymodel)
 void tst_QItemSelectionModel::layoutChangedWithAllSelected1()
 {
     QStringListModel model( QStringList() << "foo" << "bar" << "foo2");
@@ -2327,6 +2343,7 @@ void tst_QItemSelectionModel::layoutChangedWithAllSelected2()
     for (const auto &index : indexList)
         QVERIFY(selection.isSelected(index));
 }
+#endif
 
 // This test is a regression test for QTBUG-2804.
 void tst_QItemSelectionModel::layoutChangedTreeSelection()
@@ -2710,6 +2727,9 @@ void tst_QItemSelectionModel::QTBUG48402()
     model.removeRows(removeTop, removeBottom - removeTop + 1);
 
     QCOMPARE(QItemSelectionRange(helper.tl, helper.br), QItemSelectionRange(dtl, dbr));
+    QT_TEST_EQUALITY_OPS(QItemSelectionRange(helper.tl, helper.br), QItemSelectionRange(dtl, dbr), true);
+    QT_TEST_EQUALITY_OPS(QItemSelectionRange(), QItemSelectionRange(), true);
+    QT_TEST_EQUALITY_OPS(QItemSelectionRange(helper.tl, helper.br), QItemSelectionRange(), false);
 }
 
 void tst_QItemSelectionModel::QTBUG58851_data()
@@ -2738,6 +2758,7 @@ void tst_QItemSelectionModel::QTBUG58851_data()
                 << IntPair(2, 3));
 }
 
+#if QT_CONFIG(proxymodel)
 void tst_QItemSelectionModel::QTBUG58851()
 {
     using IntPair = std::pair<int, int>;
@@ -2782,6 +2803,7 @@ void tst_QItemSelectionModel::QTBUG58851()
         QVERIFY(selections.isSelected(i));
     }
 }
+#endif
 
 void tst_QItemSelectionModel::QTBUG18001_data()
 {
@@ -2917,5 +2939,53 @@ void tst_QItemSelectionModel::QTBUG93305()
     QCOMPARE(spy.size(), 4);
 }
 
+static void (*oldMessageHandler)(QtMsgType, const QMessageLogContext&, const QString&);
+static bool signalError = false;
+
+// detect disconnect warning:
+// qt.core.qobject.connect: QObject::disconnect: No such signal
+void tst_QItemSelectionModel::messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    Q_ASSERT(oldMessageHandler);
+
+    if (type == QtWarningMsg
+            && QString(context.category) == "qt.core.qobject.connect"
+            && msg.contains("No such")) {
+        signalError = true;
+    }
+
+    return oldMessageHandler(type, context, msg);
+}
+
+void tst_QItemSelectionModel::testSignalsDisconnection()
+{
+    oldMessageHandler = qInstallMessageHandler(messageHandler);
+    auto resetMessageHandler = qScopeGuard([] { qInstallMessageHandler(oldMessageHandler); });
+    auto *newModel = new QStandardItemModel(model);
+    selection->setModel(newModel);
+    QSignalSpy spy(newModel, &QObject::destroyed);
+    delete newModel;
+    QTRY_COMPARE(spy.count(), 1);
+    qDebug() << spy;
+    selection->setModel(nullptr);
+    QVERIFY(!signalError);
+}
+
+void tst_QItemSelectionModel::destroyModel()
+{
+    auto itemModel = std::make_unique<QStandardItemModel>(5, 5);
+    auto selectionModel = std::make_unique<QItemSelectionModel>();
+    selectionModel->setModel(itemModel.get());
+    selectionModel->select(itemModel->index(0, 0), QItemSelectionModel::Select);
+    QVERIFY(!selectionModel->selection().isEmpty());
+    selectionModel->setCurrentIndex(itemModel->index(1, 0), QItemSelectionModel::Select);
+    QVERIFY(selectionModel->currentIndex().isValid());
+
+    QTest::failOnWarning();
+    itemModel.reset();
+    QVERIFY(!selectionModel->currentIndex().isValid());
+    QVERIFY(selectionModel->selection().isEmpty());
+}
+
 QTEST_MAIN(tst_QItemSelectionModel)
 #include "tst_qitemselectionmodel.moc"