From 29c113d912fdf96f99503c9635bf89c4cabcc6fb Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 26 Oct 2020 14:39:54 +0100 Subject: Deprecate ordering on QItemSelectionRange Ready for removal at Qt 6, as advocated in a ### comment. It was never done consistently with operator==(), apparently, and should not be needed in any case. [ChangeLog][QtCore][QItemSelectionRange] Ordering of QItemSelectionRange is now deprecated. It was not consistent with equality and should not be needed. Task-number: QTBUG-85700 Pick-to: 5.15 5.15.2 Change-Id: Ie99294bd7fc18f2a497598ae08840886b0a6d62d Reviewed-by: Lars Knoll --- .../itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/corelib/itemmodels') diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp index 92f9c87b9f..e9bc0581be 100644 --- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -82,8 +82,10 @@ private slots: void layoutChangedWithAllSelected2(); void layoutChangedTreeSelection(); void deselectRemovedMiddleRange(); +#if QT_DEPRECATED_SINCE(5, 15) void rangeOperatorLessThan_data(); void rangeOperatorLessThan(); +#endif void setModel(); void testDifferentModels(); @@ -2445,6 +2447,7 @@ static QStandardItemModel* getModel(QObject *parent) return model; } +#if QT_DEPRECATED_SINCE(5, 15) enum Result { LessThan, NotLessThan, @@ -2579,6 +2582,7 @@ void tst_QItemSelectionModel::rangeOperatorLessThan() if (!(r2 < r4)) QVERIFY(r4 < r2); } +#endif void tst_QItemSelectionModel::setModel() { -- cgit v1.2.3