summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlist.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-04 01:01:28 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-04 01:01:43 +0200
commit74a33df026cdcf6d4c352a931c2d9ccf6c85c04d (patch)
tree54ec224d577b0b94fe9d39f538c3f9d8dcf6478a /src/corelib/tools/qlist.h
parent5ab8efd66a1a3c56f04a393ed1fe558ec8c1ba5c (diff)
parente9f10dfe8c19b74dfb52179fd04414c563812d83 (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/corelib/tools/qlist.h')
-rw-r--r--src/corelib/tools/qlist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index be987c359b..425ffa42a5 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -1051,7 +1051,7 @@ int lastIndexOf(const QList<T> &list, const U &u, int from)
Node *n = reinterpret_cast<Node *>(list.p.at(from + 1));
while (n-- != b) {
if (n->t() == u)
- return typename QList<T>::difference_type(n - b);
+ return int(n - b);
}
}
return -1;