diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-19 10:07:29 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-19 22:11:50 +0200 |
| commit | 37c7ef4f4a8478e94eaf0af5b40c279c476fa561 (patch) | |
| tree | 76cdeea2afb6785eeea0651054bd5787d9541810 /src/corelib/kernel/qiterable_p.h | |
| parent | 52083e4da505bfe6abeb9e36ffd68ecefbbf6964 (diff) | |
QMetaContainer: Consistently coerce types
The high-level iterable interfaces should coerce the types of most
QVariants passed to the expected ones. To do this, move the type
coercion code into qvariant.{h|cpp} so that it is available to the
QVariantRef specializations.
The exception are variants passed to the find() functions of associative
iterables. Here, we should not coerce values we cannot convert to the
default-constructed keys. Instead we return end() in such cases.
Fixes: QTBUG-87687
Change-Id: I0bd4e5c4e4e270dd3bf36cb3fb115794828077f2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qiterable_p.h')
| -rw-r--r-- | src/corelib/kernel/qiterable_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/kernel/qiterable_p.h b/src/corelib/kernel/qiterable_p.h index 33b190a59a..979ef49b18 100644 --- a/src/corelib/kernel/qiterable_p.h +++ b/src/corelib/kernel/qiterable_p.h @@ -58,8 +58,6 @@ QT_BEGIN_NAMESPACE namespace QIterablePrivate { -const void *coerceType(QVariant &value, const QMetaType &type); - template<typename Callback> static QVariant retrieveElement(const QMetaType &type, Callback callback) { |