diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 12:02:14 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 17:04:41 +0200 |
| commit | 42b5c28db510bd5facef34267f7fd66a57793030 (patch) | |
| tree | 7c79ca817a2c0d974a0135ee2f3e5d49b0226d56 /src/corelib/kernel/qmetatype.h | |
| parent | 8e48184120f74c02447c8d96408c1c003cd7fd79 (diff) | |
QAssociativeIterableImpl::advanceImpl(): remove deprecation protection
The comment claims it is needed for "the deprecated
QHash::iterator::operator--()", which has been removed already.
Change-Id: I90f5abdcd14e6cac4ed7144e96eb26bf34477391
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 44cdcb3008..e5a71dd5a8 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1186,12 +1186,9 @@ public: { IteratorOwner<typename T::const_iterator>::assign(iterator, static_cast<const T*>(container)->find(*static_cast<const typename T::key_type*>(p))); } - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED // Hits on the deprecated QHash::iterator::operator--() template<class T> static void advanceImpl(void **p, int step) { std::advance(*static_cast<typename T::const_iterator*>(*p), step); } - QT_WARNING_POP template<class T> static void beginImpl(const void *container, void **iterator) |