diff -r e24348a560a6 -r b72c6db6890b src/corelib/tools/qhash.h --- a/src/corelib/tools/qhash.h Fri Jun 11 14:24:45 2010 +0300 +++ b/src/corelib/tools/qhash.h Wed Jun 23 19:07:03 2010 +0300 @@ -927,7 +927,7 @@ { return QHash::insertMulti(key, value); } inline QMultiHash &operator+=(const QMultiHash &other) - { unite(other); return *this; } + { this->unite(other); return *this; } inline QMultiHash operator+(const QMultiHash &other) const { QMultiHash result = *this; result += other; return result; } @@ -1002,12 +1002,7 @@ typename QHash::iterator end(QHash::end()); while (i != end && i.key() == key) { if (i.value() == value) { -#if defined(Q_CC_RVCT) - // RVCT has problems with scoping, apparently. - i = QHash::erase(i); -#else - i = erase(i); -#endif + i = this->erase(i); ++n; } else { ++i;