diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-11-29 13:08:17 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-12-02 09:05:10 +0100 |
| commit | 7a55a984d8d0da6a6cf6fdc440d4cccf7fb42c3d (patch) | |
| tree | 77b6dba4a6878def8f4123d818b008cf3edd9955 /src | |
| parent | c0fb2a81737c07f213c3a8c36732149e0c58ed0d (diff) | |
Workaround warning in QHash::unite
The warning pragmas don't work in gcc due to the fact this is a
template.
I've been told that unite() will disappear but meanwhile i think it's
better if we simply don't give a warning that people can't protect
themselves against
Change-Id: I358e629be86e0e675ef3e49a7fbc4f7f65ae97f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qhash.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 9108be4dc6..42f8dbd155 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -616,10 +616,7 @@ Q_INLINE_TEMPLATE QHash<Key, T> &QHash<Key, T>::unite(const QHash &other) QHash copy(other); const_iterator it = copy.constEnd(); while (it != copy.constBegin()) { - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED - --it; - QT_WARNING_POP + it.i = QHashData::previousNode(it.i); insertMulti(it.key(), it.value()); } #else |