From 0208cac94fbd79fc563c903e2b973d79f9644b82 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 20 Jul 2015 01:10:53 +0200 Subject: QItemSelectionRange: don't compare pointers with op< ... use std::less<> to avoid undefined behavior. Change-Id: Ib6736f86359c4a16fd90ca63b57a8517c6137ead Reviewed-by: Friedemann Kleint Reviewed-by: Giuseppe D'Angelo --- src/corelib/itemmodels/qitemselectionmodel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/corelib/itemmodels/qitemselectionmodel.cpp') diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index 6c7101d41f..74bd7abfcb 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -42,6 +42,7 @@ #include #include +#include #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 less; + return less(tl.model(), other.tl.model()); } /*! -- cgit v1.2.3