diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-06 01:01:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-06 01:01:08 +0200 |
| commit | 2c4b44d7500be72b6eb74c4989e7311b3f924119 (patch) | |
| tree | 8cf8cb8aa36f18ee9474486178f51c7fe0770ee8 /src/corelib/tools | |
| parent | 7e2016de5ee6d9cc2c5d6b94fab4bc56a8a33303 (diff) | |
| parent | 327b305e95187fda869c5af407e78a17e0e381cd (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ife31dad3c8dc43c5ff4d266e6d646230c5d20a50
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlist.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qpair.qdoc | 1 |
2 files changed, 2 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; diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index 59e6931995..65576ef2e6 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -28,6 +28,7 @@ /*! \class QPair \inmodule QtCore + \reentrant \brief The QPair class is a template class that stores a pair of items. \ingroup tools |