summaryrefslogtreecommitdiffstats
path: root/src/corelib/itemmodels
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-05-19 08:57:59 +0200
committerLiang Qi <liang.qi@qt.io>2017-05-19 08:57:59 +0200
commit550e16b8141caf8d6c0614a423a295b0aea9cab1 (patch)
tree1495e6a9808d1140142a2cf46c6e36cba95f8890 /src/corelib/itemmodels
parent087b4fc6cd3a68db6ac4c3a7f43c03aa6e73c088 (diff)
parent9954187adba4d26a1b1aa93874993f15d6d8a0b9 (diff)
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Diffstat (limited to 'src/corelib/itemmodels')
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index 7714aa5e46..2ff311bc5a 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -42,6 +42,7 @@
#include <qdebug.h>
#include <algorithm>
+#include <functional>
#ifndef QT_NO_ITEMVIEWS
@@ -307,7 +308,9 @@ bool QItemSelectionRange::operator<(const QItemSelectionRange &other) const
}
return topLeftParent < otherTopLeftParent;
}
- return tl.model() < other.tl.model();
+
+ std::less<const QAbstractItemModel *> less;
+ return less(tl.model(), other.tl.model());
}
/*!