diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-26 14:39:54 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-29 06:29:14 +0000 |
| commit | 171c3c34463aae5c814b1aecbb7e35d99a7c60c8 (patch) | |
| tree | 64f98005d8122e823341d0853e1337deabdca58c /tests | |
| parent | c008da85081642ff4ea5db962b9562630ebd9fe9 (diff) | |
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
Change-Id: Ie99294bd7fc18f2a497598ae08840886b0a6d62d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 29c113d912fdf96f99503c9635bf89c4cabcc6fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp index 6b59a6f1af..12cc584773 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(); @@ -2441,6 +2443,7 @@ static QStandardItemModel* getModel(QObject *parent) return model; } +#if QT_DEPRECATED_SINCE(5, 15) enum Result { LessThan, NotLessThan, @@ -2575,6 +2578,7 @@ void tst_QItemSelectionModel::rangeOperatorLessThan() if (!(r2 < r4)) QVERIFY(r4 < r2); } +#endif void tst_QItemSelectionModel::setModel() { |