1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround warning in QHash::unite

Browse Source 
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>
This commit is contained in:
Albert Astals Cid 2019-11-29 13:08:17 +01:00
parent c0fb2a8173
commit 7a55a984d8
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/tools/qhash.h
View File

@ -616,10 +616,7 @@ Q_INLINE_TEMPLATE QHash<Key, T> &QHash<Key, T>::unite(const QHash &other)
QHash copy(other); QHash copy(other);
const_iterator it = copy.constEnd(); const_iterator it = copy.constEnd();
while (it != copy.constBegin()) { while (it != copy.constBegin()) {
QT_WARNING_PUSH it.i = QHashData::previousNode(it.i);
QT_WARNING_DISABLE_DEPRECATED
--it;
QT_WARNING_POP
insertMulti(it.key(), it.value()); insertMulti(it.key(), it.value());
} }
#else #else